<!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-11-27 21:18:49 +0900 (Sun, 27 Nov 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/80cce98636de6426d92ee52c89b6b1bb12b006dc">80cce98636de6426d92ee52c89b6b1bb12b006dc</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Merge</dt>
<dd style="margin-left: 8.5em">
<ul>
<li>Merged ab791c1: Merge branch 'master' of github.com:mroonga/mroonga</li>
</ul>
</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">suppress warnings.</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/80cce98636de6426d92ee52c89b6b1bb12b006dc#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 (+4 -5)</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/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7964">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7965">7965</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7966">7966</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7967">7967</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7968">7968</a></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/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7969">7969</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7970">7970</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7971">7971</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7972">7972</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7973">7973</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7974">7974</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7975">7975</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7976">7976</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L7977">7977</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L8026">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L8027">8027</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L8028">8028</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L8029">8029</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L8030">8030</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L8031">8031</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L8032">8032</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L8033">8033</a></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/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L8034">8034</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L8035">8035</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0L8036">8036</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/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7964">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7965">7965</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7966">7966</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7967">7967</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </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/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7968">7968</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7969">7969</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7970">7970</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7971">7971</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7972">7972</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7973">7973</a></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/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7974">7974</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7975">7975</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R7976">7976</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R8025">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R8026">8026</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R8027">8027</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R8028">8028</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-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R8029">8029</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/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R8030">8030</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R8031">8031</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </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/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R8032">8032</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R8033">8033</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R8034">8034</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/80cce98636de6426d92ee52c89b6b1bb12b006dc#L0R8035">8035</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">@@ -7965,13 +7965,12 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_add_index(TABLE *table_arg, KEY *key_info,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #endif</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int res = 0;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- uint i, j, k;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ uint i;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> uint n_keys = table->s->keys;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_obj *index_tables[num_of_keys + n_keys];</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_obj *index_columns[num_of_keys + n_keys];</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> char grn_table_name[MRN_MAX_PATH_SIZE];</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> char decode_name[MRN_MAX_PATH_SIZE];</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- THD *thd = ha_thd();</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> MRN_SHARE *tmp_share;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> TABLE_SHARE tmp_table_share;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> char **key_parser;</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -8027,10 +8026,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_add_index(TABLE *table_arg, KEY *key_info,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> bitmap_set_all(table->read_set);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (res)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- for (k = 0; k < i; k++) {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- if (index_tables[k + n_keys])</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ for (uint j = 0; j < i; j++) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (index_tables[j + n_keys])</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- grn_obj_remove(ctx, index_tables[k + n_keys]);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ grn_obj_remove(ctx, index_tables[j + n_keys]);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>