<!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">Kentoku <kento****@gmail*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2011-11-10 12:16:50 +0900 (Thu, 10 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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8">8a83e9d848235daf2f3bbae28b40fa01ff4eacc8</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">supports sql_calc_found_rows. refs #1161</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#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 (+19 -1)</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5928">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5929">5929</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5930">5930</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5931">5931</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5932">5932</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-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-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-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-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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5933">5933</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5934">5934</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5935">5935</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5952">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5953">5953</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5954">5954</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5955">5955</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-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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5956">5956</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5957">5957</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0L5958">5958</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5928">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5929">5929</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5930">5930</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5931">5931</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5932">5932</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5933">5933</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5934">5934</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5935">5935</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5936">5936</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5937">5937</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5938">5938</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5939">5939</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5940">5940</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5941">5941</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5942">5942</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5943">5943</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5944">5944</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5945">5945</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5946">5946</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5947">5947</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5964">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5965">5965</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5966">5966</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5967">5967</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5968">5968</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5969">5969</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5970">5970</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5971">5971</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5972">5972</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/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5973">5973</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5974">5974</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5975">5975</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8a83e9d848235daf2f3bbae28b40fa01ff4eacc8#L0R5976">5976</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">@@ -5929,7 +5929,19 @@ <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"> grn_obj *score_column)</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_DBUG_ENTER_METHOD();</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- st_select_lex *select_lex = table->pos_in_table_list->select_lex;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ TABLE_LIST *table_list = table->pos_in_table_list;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ st_select_lex *select_lex = table_list->select_lex;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ SELECT_LEX_UNIT *unit = table_list->derived;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ st_select_lex *first_select_lex;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (unit)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ first_select_lex = unit->first_select();</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ } else {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ first_select_lex = select_lex;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ }</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ DBUG_PRINT("info",</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ ("mroonga: first_select_lex->options=%u",</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ first_select_lex ? first_select_lex->options : 0));</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> thd_sql_command(ha_thd()) == SQLCOM_SELECT &&</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -5953,6 +5965,12 @@ <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-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (first_select_lex && (first_select_lex->options & OPTION_FOUND_ROWS)) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ DBUG_PRINT("info",</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ ("mroonga: fast_order_limit = FALSE by calc_found_rows"));</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ fast_order_limit = FALSE;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ DBUG_VOID_RETURN;</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"> Item *info = (Item *)select_lex->item_list.first_node()->info;</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"> where = select_lex->where;</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>