<!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 00:04:44 +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/edb11b0f3674c1416646cabe003abd37d577d030">edb11b0f3674c1416646cabe003abd37d577d030</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: follow SELECT_LEX::non_agg_fields API change
It's not the same condition. We may need to use a feature in
sql/aggregate_check.h.</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/edb11b0f3674c1416646cabe003abd37d577d030#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 -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; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L209">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L210">210</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L211">211</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L212">212</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/edb11b0f3674c1416646cabe003abd37d577d030#L0L213">213</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L214">214</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L215">215</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L216">216</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L217">217</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/edb11b0f3674c1416646cabe003abd37d577d030#L0L218">218</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L219">219</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L220">220</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L9211">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L9212">9212</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L9213">9213</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L9214">9214</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/edb11b0f3674c1416646cabe003abd37d577d030#L0L9215">9215</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/edb11b0f3674c1416646cabe003abd37d577d030#L0L9216">9216</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L9217">9217</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0L9218">9218</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/edb11b0f3674c1416646cabe003abd37d577d030#L0R209">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R210">210</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R211">211</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R212">212</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/edb11b0f3674c1416646cabe003abd37d577d030#L0R213">213</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/edb11b0f3674c1416646cabe003abd37d577d030#L0R214">214</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R215">215</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R216">216</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R217">217</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R218">218</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R219">219</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/edb11b0f3674c1416646cabe003abd37d577d030#L0R220">220</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/edb11b0f3674c1416646cabe003abd37d577d030#L0R221">221</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R222">222</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R223">223</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R224">224</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R9215">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R9216">9216</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R9217">9217</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R9218">9218</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/edb11b0f3674c1416646cabe003abd37d577d030#L0R9219">9219</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R9220">9220</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R9221">9221</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/edb11b0f3674c1416646cabe003abd37d577d030#L0R9222">9222</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">@@ -210,11 +210,15 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">static mysql_mutex_t *mrn_LOCK_open;</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ((select_lex)->where_cond())</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # define MRN_SELECT_LEX_GET_HAVING_COND(select_lex) \</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ((select_lex)->having_cond())</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+# define MRN_SELECT_LEX_IS_AGG_FUNC_USED(select_lex) \</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ ((select_lex)->agg_func_used())</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #else</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # define MRN_SELECT_LEX_GET_WHERE_COND(select_lex) \</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ((select_lex)->where)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # define MRN_SELECT_LEX_GET_HAVING_COND(select_lex) \</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ((select_lex)->having)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+# define MRN_SELECT_LEX_IS_AGG_FUNC_USED(select_lex) \</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ ((select_lex)->non_agg_fields.elements)</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"> Rpl_filter *mrn_binlog_filter;</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -9212,7 +9216,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"> </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-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- !select_lex->non_agg_fields.elements &&</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ !MRN_SELECT_LEX_IS_AGG_FUNC_USED(select_lex) &&</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> !select_lex->group_list.elements &&</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> !MRN_SELECT_LEX_GET_HAVING_COND(select_lex) &&</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> select_lex->table_list.elements == 1</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>