<!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-16 23:32:32 +0900 (Mon, 16 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/ff1b082bdb894a14c989909759f4ac8969bd1206">ff1b082bdb894a14c989909759f4ac8969bd1206</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 calculate_key_len() API change</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/ff1b082bdb894a14c989909759f4ac8969bd1206#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 (+12 -2)</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L196">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L197">197</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L198">198</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L199">199</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L200">200</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L201">201</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L202">202</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L6927">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L6928">6928</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L6929">6929</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L6930">6930</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L6931">6931</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L6932">6932</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L6933">6933</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L6934">6934</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L7131">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L7132">7132</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L7133">7133</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L7134">7134</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L7135">7135</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L7136">7136</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L7137">7137</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0L7138">7138</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R196">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R197">197</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R198">198</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R199">199</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R200">200</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R201">201</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R202">202</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R203">203</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R204">204</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R205">205</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R206">206</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R207">207</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R208">208</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R209">209</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R210">210</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R6935">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R6936">6936</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R6937">6937</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R6938">6938</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R6939">6939</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R6940">6940</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R6941">6941</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R6942">6942</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R6943">6943</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R7140">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R7141">7141</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R7142">7142</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R7143">7143</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R7144">7144</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/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R7145">7145</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R7146">7146</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R7147">7147</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/ff1b082bdb894a14c989909759f4ac8969bd1206#L0R7148">7148</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">@@ -197,6 +197,14 @@ <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"> # define MRN_KEYTYPE_FOREIGN Key::FOREIGN_KEY</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-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#if MYSQL_VERSION_ID >= 50706 && !defined(MRN_MARIADB_P)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+# define mrn_calculate_key_len(table, key_index, buffer, keypart_map) \</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ calculate_key_len(table, key_index, keypart_map)</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">+# define mrn_calculate_key_len(table, key_index, buffer, keypart_map) \</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ calculate_key_len(table, key_index, buffer, keypart_map)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#endif</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"> Rpl_filter *mrn_binlog_filter;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Time_zone *mrn_my_tz_UTC;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #ifdef MRN_HAVE_TABLE_DEF_CACHE</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -6928,7 +6936,8 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_index_read_map(uchar *buf, const uchar *key,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> bool is_multiple_column_index = KEY_N_KEY_PARTS(&key_info) > 1;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (is_multiple_column_index) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mrn_change_encoding(ctx, NULL);</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- uint key_length = calculate_key_len(table, active_index, key, keypart_map);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ uint key_length =</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ mrn_calculate_key_len(table, active_index, key, keypart_map);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_PRINT("info",</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ("mroonga: multiple column index: "</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "search key length=<%u>, "</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -7132,7 +7141,8 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_index_read_last_map(uchar *buf, const uchar *key,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (is_multiple_column_index) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mrn_change_encoding(ctx, NULL);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> flags |= GRN_CURSOR_PREFIX;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- uint key_length = calculate_key_len(table, active_index, key, keypart_map);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ uint key_length =</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ mrn_calculate_key_len(table, active_index, key, keypart_map);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> key_min = key_min_entity;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> storage_encode_multiple_column_key(&key_info,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> key, key_length,</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>