<!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-10-27 15:11:33 +0900 (Thu, 27 Oct 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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa">a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa</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">unify variable name: multicolumn_key -> multiple_column_index.</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#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 -3)</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7322">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7323">7323</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7324">7324</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7325">7325</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7326">7326</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7327">7327</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7328">7328</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7329">7329</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7358">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7359">7359</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7360">7360</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7361">7361</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7362">7362</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7363">7363</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7364">7364</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7365">7365</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7366">7366</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7367">7367</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0L7368">7368</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7322">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7323">7323</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7324">7324</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7325">7325</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7326">7326</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7327">7327</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7328">7328</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7329">7329</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7330">7330</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7359">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7360">7360</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7361">7361</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7362">7362</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7363">7363</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7364">7364</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7365">7365</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/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7366">7366</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7367">7367</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7368">7368</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/a12d29fc925e32bbf3883a9f10d46ed9cc95b8fa#L0R7369">7369</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">@@ -7323,7 +7323,8 @@ <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"> TABLE_SHARE tmp_table_share;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> char **key_parser;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> uint *key_parser_length;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- bool have_multicolumn_key = FALSE;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ bool have_multiple_column_index = FALSE;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> MRN_DBUG_ENTER_METHOD();</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> tmp_table_share.keys = n_keys + num_of_keys;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (!(tmp_share = (MRN_SHARE *)</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -7359,10 +7360,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"> !(key_info[i].flags & HA_FULLTEXT)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mrn_set_bitmap_by_key(table->read_set, &key_info[i]);</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- have_multicolumn_key = TRUE;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ have_multiple_column_index = TRUE;</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-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- if (!res && have_multicolumn_key)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (!res && have_multiple_column_index)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> res = storage_add_index_multiple_columns(key_info, num_of_keys,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> index_columns);</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>