<!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">Kentaro Hayashi <hayas****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2017-04-13 17:13:26 +0900 (Thu, 13 Apr 2017)</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/26ceab65e825e2e52f6036bdb32cd7588014e48b">26ceab65e825e2e52f6036bdb32cd7588014e48b</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">Revert "Fix build error on MySQL 5.6.36 and MySQL 5.7.18"
This reverts commit <a href="https://github.com/mroonga/mroonga/commit/4afbace5f741dc2cb5a966bf1108f8fe2317ea85">4afbace5f741dc2cb5a966bf1108f8fe2317ea85</a>.
This change is not correct way to fix the issue.</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/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2">ha_mroonga.cpp</a></li>
<li><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71">mrn_mysql_compat.h</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 (+0 -4)</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/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4286">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4287">4287</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4288">4288</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4289">4289</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4290">4290</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4291">4291</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4292">4292</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4293">4293</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4294">4294</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4295">4295</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4304">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4305">4305</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4306">4306</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4307">4307</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4308">4308</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4309">4309</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4310">4310</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4311">4311</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4312">4312</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2L4313">4313</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/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4286">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4287">4287</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4288">4288</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4289">4289</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/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4290">4290</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/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4291">4291</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4292">4292</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4293">4293</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4302">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4303">4303</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4304">4304</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4305">4305</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/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4306">4306</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/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4307">4307</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4308">4308</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-ba714ec217aa6836e39b3aea9da57ae2R4309">4309</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">@@ -4287,9 +4287,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">void ha_mroonga::wrapper_overwrite_index_bits()</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"> Field *field = table_share->field[i];</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> field->part_of_key.clear_all();</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">-#ifdef MRN_HAVE_MYSQL_FIELD_PART_OF_KEY_NOT_CLUSTERED</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> field->part_of_key_not_clustered.clear_all();</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">-#endif</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> field->part_of_sortkey.clear_all();</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> for (i = 0; i < table_share->keys; i++) {</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -4305,9 +4303,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">void ha_mroonga::wrapper_overwrite_index_bits()</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"> table_share->keys_for_keyread.set_bit(i);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> field->part_of_key.set_bit(i);</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">-#ifdef MRN_HAVE_MYSQL_FIELD_PART_OF_KEY_NOT_CLUSTERED</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> field->part_of_key_not_clustered.set_bit(i);</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; 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"> if (index_flags(i, j, 1) & HA_READ_ORDER)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> field->part_of_sortkey.set_bit(i);</span>
</pre>
</td>
</tr>
</tbody>
</table>
<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: mrn_mysql_compat.h (+0 -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; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71L350">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71L351">351</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71L352">352</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71L353">353</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71L354">354</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71L355">355</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71L356">356</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71L357">357</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71L358">358</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71L359">359</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/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71R350">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71R351">351</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71R352">352</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71R353">353</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/26ceab65e825e2e52f6036bdb32cd7588014e48b#diff-b2c9ca22203d999ad908b68f261c0e71R354">354</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">@@ -351,9 +351,4 @@</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> (c == FN_LIBCHAR || c == FN_LIBCHAR2)</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-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">-#if ((MYSQL_VERSION_ID < 50636) || \</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">- (MYSQL_VERSION_ID >= 50700 && MYSQL_VERSION_ID < 50718)) && !defined(MRN_MARIADB_P)</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">-# define MRN_HAVE_MYSQL_FIELD_PART_OF_KEY_NOT_CLUSTERED</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">-#endif</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">-</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #endif /* MRN_MYSQL_COMPAT_H_ */</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>