<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">Kouhei Sutou <kou****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2011-05-08 23:46:36 +0900 (Sun, 08 May 2011)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab">fe8843b1b361e689efe77854ee8aec7009a499ab</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Log</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em">add missing dbug_tmp_restore_column_map()s.</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#diff-0">ha_mroonga.cc</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: ha_mroonga.cc (+6 -0)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1481">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1482">1482</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1483">1483</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1484">1484</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1485">1485</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1486">1486</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1487">1487</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1552">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1553">1553</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1554">1554</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1555">1555</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1556">1556</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1557">1557</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0L1558">1558</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1481">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1482">1482</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1483">1483</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1484">1484</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1485">1485</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1486">1486</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1487">1487</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1488">1488</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1489">1489</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1490">1490</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1555">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1556">1556</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1557">1557</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1558">1558</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1559">1559</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1560">1560</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1561">1561</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1562">1562</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1563">1563</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/fe8843b1b361e689efe77854ee8aec7009a499ab#L0R1564">1564</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1482,6 +1482,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::write_row(uchar *buf)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int added;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> row_id = grn_table_add(ctx, tbl, pkey, pkey_size, &added);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (ctx->rc) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#ifndef DBUG_OFF</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ dbug_tmp_restore_column_map(table->read_set, tmp_map);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#endif</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> my_message(ER_ERROR_ON_WRITE, ctx->errbuf, MYF(0));</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_RETURN(ER_ERROR_ON_WRITE);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1553,6 +1556,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::write_row(uchar *buf)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> pthread_mutex_lock(&mrn_allocated_thds_mutex);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (my_hash_insert(&mrn_allocated_thds, (uchar*) thd))</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#ifndef DBUG_OFF</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ dbug_tmp_restore_column_map(table->read_set, tmp_map);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#endif</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_RETURN(HA_ERR_OUT_OF_MEM);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> pthread_mutex_unlock(&mrn_allocated_thds_mutex);</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>