<!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">2015-03-17 21:14:40 +0900 (Tue, 17 Mar 2015)</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/9e0fa00747160e612e3498a644a25bd7825a95a1">9e0fa00747160e612e3498a644a25bd7825a95a1</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</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; width: auto">mysql57: use wrapper macro to get SELECT_LEX::where</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/9e0fa00747160e612e3498a644a25bd7825a95a1#diff-0">ha_mroonga.cpp</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; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: ha_mroonga.cpp (+5 -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; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9239">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9240">9240</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9241">9241</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9242">9242</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/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9243">9243</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/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9244">9244</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9245">9245</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9246">9246</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9283">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9284">9284</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9285">9285</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9286">9286</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/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9287">9287</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/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9288">9288</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9289">9289</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9290">9290</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9398">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9399">9399</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9400">9400</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9401">9401</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/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9402">9402</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/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9403">9403</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9404">9404</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0L9405">9405</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; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9239">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9240">9240</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9241">9241</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9242">9242</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/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9243">9243</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9244">9244</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9245">9245</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9246">9246</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9283">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9284">9284</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9285">9285</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9286">9286</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/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9287">9287</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/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9288">9288</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/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9289">9289</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9290">9290</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9291">9291</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9292">9292</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9400">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9401">9401</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9402">9402</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9403">9403</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/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9404">9404</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9405">9405</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9406">9406</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9e0fa00747160e612e3498a644a25bd7825a95a1#L0R9407">9407</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; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -9240,7 +9240,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">void ha_mroonga::check_count_skip(key_part_map start_key_part_map,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Item *where;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (fulltext) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_PRINT("info", ("mroonga: count skip: fulltext"));</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- where = select_lex->where;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ where = MRN_SELECT_LEX_GET_WHERE_COND(select_lex);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (!where ||</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> where->type() != Item::FUNC_ITEM ||</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ((Item_func *)where)->functype() != Item_func::FT_FUNC) {</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -9284,7 +9284,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">void ha_mroonga::check_count_skip(key_part_map start_key_part_map,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> uint key_nr = active_index;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> KEY key_info = table->key_info[key_nr];</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> KEY_PART_INFO *key_part = key_info.key_part;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- for (where = select_lex->where; where; where = where->next) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ for (where = MRN_SELECT_LEX_GET_WHERE_COND(select_lex);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ where;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ where = where->next) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (where->type() == Item::FIELD_ITEM)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Field *field = ((Item_field *)where)->field;</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -9399,7 +9401,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">void ha_mroonga::check_fast_order_limit(grn_table_sort_key **sort_keys,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> fast_order_limit = false;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_VOID_RETURN;</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">- Item *where = select_lex->where;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ Item *where = MRN_SELECT_LEX_GET_WHERE_COND(select_lex);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> const Item_func *match_against = NULL;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (where) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> bool is_storage_mode = !(share->wrapper_mode);</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>