<!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">2011-08-12 12:17:11 +0900 (Fri, 12 Aug 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/9714f9900f5e341f1e89654a383a96aa89de7eae">9714f9900f5e341f1e89654a383a96aa89de7eae</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">[mysql-5.6] use get_table_def_key() in MySQL 5.6.3. fixes #1046</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/9714f9900f5e341f1e89654a383a96aa89de7eae#diff-0">mrn_table.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: mrn_table.cc (+6 -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/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L576">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L577">577</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L578">578</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L579">579</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/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L580">580</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L581">581</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L582">582</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L583">583</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L584">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L585">585</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L586">586</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L587">587</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/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L588">588</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/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L589">589</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L590">590</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0L591">591</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/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R576">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R577">577</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R578">578</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R579">579</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/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R580">580</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R581">581</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R582">582</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R583">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R584">584</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R585">585</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R586">586</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/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R587">587</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/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R588">588</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/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R589">589</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/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R590">590</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/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R591">591</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R592">592</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/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R593">593</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R594">594</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R595">595</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/9714f9900f5e341f1e89654a383a96aa89de7eae#L0R596">596</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">@@ -577,7 +577,6 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int mrn_free_share(MRN_SHARE *share)</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 *mrn_get_table_share(TABLE_LIST *table_list, int *error)</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">- char key[MAX_DBKEY_LENGTH];</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> uint key_length;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> TABLE_SHARE *share;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #if MYSQL_VERSION_ID >= 50500</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -585,7 +584,13 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">TABLE_SHARE *mrn_get_table_share(TABLE_LIST *table_list, int *error)</span></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"> THD *thd = current_thd;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_ENTER("mrn_get_table_share");</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#if MYSQL_VERSION_ID >= 50603</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ const char *key;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ key_length = get_table_def_key(table_list, &key);</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">+ char key[MAX_DBKEY_LENGTH];</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> key_length = create_table_def_key(thd, key, table_list, FALSE);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#endif</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #if MYSQL_VERSION_ID >= 50500</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> hash_value = my_calc_hash(&table_def_cache, (uchar*) key, key_length);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> share = get_table_share(thd, table_list, key, key_length, 0, error,</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>