<!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">2018-04-11 16:53:06 +0900 (Wed, 11 Apr 2018)</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/acb347d4213fbf161ad3593ad1cc65b0c198072f">acb347d4213fbf161ad3593ad1cc65b0c198072f</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">percona: support auto DB type fix
It's occurred when you update from < 5.6.16 or < 5.7.10.</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/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2">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 (+9 -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/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1920">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1921">1921</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1922">1922</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1923">1923</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/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1924">1924</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1925">1925</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1926">1926</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1969">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1970">1970</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1971">1971</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1972">1972</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/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1973">1973</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1974">1974</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1975">1975</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2L1976">1976</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/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1920">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1921">1921</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1922">1922</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1923">1923</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1924">1924</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1925">1925</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1926">1926</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1927">1927</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1928">1928</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1929">1929</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1930">1930</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1931">1931</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1974">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1975">1975</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1976">1976</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1977">1977</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1978">1978</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1979">1979</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1980">1980</a></span>
<span class="diff-line-number-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1981">1981</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1982">1982</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1983">1983</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/acb347d4213fbf161ad3593ad1cc65b0c198072f#diff-ba714ec217aa6836e39b3aea9da57ae2R1984">1984</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">@@ -1921,6 +1921,11 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">mrn_fix_db_type_static_rocksdb_db_type()</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"> THD *thd = current_thd;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ handlerton *tokudb_hton = ha_resolve_by_legacy_type(thd, DB_TYPE_TOKUDB);</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ if (tokudb_hton) {</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ return;</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ }</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> handlerton *rocksdb_hton = ha_resolve_by_legacy_type(thd, DB_TYPE_ROCKSDB);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (rocksdb_hton) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return;</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1970,7 +1975,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">mrn_fix_db_type_static_rocksdb_db_type()</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (type != FRMTYPE_TABLE)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> continue;</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 (db_type != DB_TYPE_ROCKSDB)</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ bool is_target_frm =</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ ((db_type == DB_TYPE_TOKUDB && !tokudb_hton) ||</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ (db_type == DB_TYPE_ROCKSDB && !rocksdb_hton));</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ if (!is_target_frm)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> continue;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> File frm_file = mysql_file_open(mrn_key_file_frm,</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>