<!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 10:17:40 +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/3c739e9c95ddbaa0987635593279b2a7cecb4fed">3c739e9c95ddbaa0987635593279b2a7cecb4fed</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] handler::nnd_next() is protected. refs #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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#diff-0">ha_mroonga.cc</a></li>
<li><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#diff-1">ha_mroonga.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"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: ha_mroonga.cc (+4 -0)</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0L2525">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0L2526">2526</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0L2527">2527</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0L2528">2528</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0L2529">2529</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0L2530">2530</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0L2531">2531</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0L2532">2532</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0R2525">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0R2526">2526</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0R2527">2527</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0R2528">2528</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0R2529">2529</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0R2530">2530</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0R2531">2531</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0R2532">2532</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0R2533">2533</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0R2534">2534</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0R2535">2535</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L0R2536">2536</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">@@ -2526,7 +2526,11 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::wrapper_rnd_next(uchar *buf)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> MRN_SET_WRAP_TABLE_KEY(this, table);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (fulltext_searching)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> set_pk_bitmap();</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#ifdef MRN_HANDLER_RND_NEXT_IS_PUBLIC</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> error = wrap_handler->rnd_next(buf);</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">+ error = wrap_handler->ha_rnd_next(buf);</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"> MRN_SET_BASE_SHARE_KEY(share, table->s);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> MRN_SET_BASE_TABLE_KEY(this, table);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_RETURN(error);</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"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: ha_mroonga.h (+11 -0)</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L41">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L42">42</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L43">43</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L44">44</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L45">45</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L46">46</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L47">47</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L152">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L153">153</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L154">154</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L155">155</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L156">156</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L157">157</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L158">158</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L159">159</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L234">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L235">235</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L236">236</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L237">237</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L238">238</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L239">239</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1L240">240</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R41">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R42">42</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R43">43</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R44">44</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R45">45</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R46">46</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R47">47</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R48">48</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R49">49</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R50">50</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R51">51</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R156">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R157">157</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R158">158</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R159">159</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R160">160</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R161">161</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R162">162</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R163">163</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R164">164</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R165">165</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R240">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R241">241</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R242">242</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R243">243</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R244">244</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R245">245</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R246">246</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R247">247</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/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R248">248</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R249">249</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R250">250</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3c739e9c95ddbaa0987635593279b2a7cecb4fed#L1R251">251</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">@@ -42,6 +42,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">extern "C" {</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"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #if MYSQL_VERSION_ID < 50600</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+# define MRN_HANDLER_RND_NEXT_IS_PUBLIC 1</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-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#if MYSQL_VERSION_ID < 50600</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> typedef Item COND;</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-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -153,7 +157,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">public:</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"> int rnd_init(bool scan); // required</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int rnd_end();</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#ifdef MRN_HANDLER_RND_NEXT_IS_PUBLIC</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int rnd_next(uchar *buf); // required</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"> int rnd_pos(uchar *buf, uchar *pos); // required</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> void position(const uchar *record); // required</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int extra(enum ha_extra_function operation);</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -235,6 +241,11 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">public:</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int optimize(THD* thd, HA_CHECK_OPT* check_opt);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> bool is_fatal_error(int error_num, uint flags);</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">+protected:</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#ifndef MRN_HANDLER_RND_NEXT_IS_PUBLIC</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ int rnd_next(uchar *buf);</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"> private:</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #ifndef MRN_HANDLER_CLOSE_IS_PUBLIC</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int close();</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>