<!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">Kentoku <kento****@gmail*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2013-06-19 02:08:40 +0900 (Wed, 19 Jun 2013)</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a">0ef887966b7a5c3c47208f55c5818a4a4fa0f69a</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">fix hiding data when lock tables and enable keys are used same time. refs #1778</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#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 (+18 -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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L98">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L99">99</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L100">100</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L101">101</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L102">102</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L103">103</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L104">104</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12579">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12580">12580</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12581">12581</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12582">12582</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12583">12583</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12584">12584</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12585">12585</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12586">12586</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12587">12587</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12588">12588</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12589">12589</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12667">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12668">12668</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12669">12669</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12670">12670</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12671">12671</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12672">12672</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12673">12673</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0L12674">12674</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R98">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R99">99</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R100">100</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R101">101</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R102">102</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R103">103</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R104">104</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R105">105</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R106">106</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R107">107</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R108">108</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12583">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12584">12584</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12585">12585</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12586">12586</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12587">12587</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12588">12588</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12589">12589</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12590">12590</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12591">12591</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12592">12592</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12593">12593</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12594">12594</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12595">12595</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12596">12596</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12597">12597</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12598">12598</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12599">12599</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12600">12600</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12678">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12679">12679</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12680">12680</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12681">12681</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12682">12682</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12683">12683</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12684">12684</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12685">12685</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12686">12686</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/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12687">12687</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12688">12688</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12689">12689</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/0ef887966b7a5c3c47208f55c5818a4a4fa0f69a#L0R12690">12690</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">@@ -99,6 +99,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">extern MYSQL_PLUGIN_IMPORT pthread_mutex_t LOCK_open;</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # define mrn_open_mutex_unlock()</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 >= 50600 && !defined(MRN_MARIADB_P)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+# define MRN_NEED_M_LOCK_TYPE_CHECK_FOR_WRAPPER_EXTERNAL_LOCK</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"> #if MYSQL_VERSION_ID >= 50603 && !defined(MRN_MARIADB_P)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # define MRN_ORDER_IS_ASC(order) ((order)->direction == ORDER::ORDER_ASC)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #else</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -12580,10 +12584,17 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::wrapper_fill_indexes(THD *thd, KEY *key_info,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int error = 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> KEY *p_key_info = &table->key_info[table_share->primary_key];</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> KEY *tmp_key_info;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#ifdef MRN_NEED_M_LOCK_TYPE_CHECK_FOR_WRAPPER_EXTERNAL_LOCK</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ int wrapper_lock_type_backup = wrap_handler->get_lock_type();</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_DBUG_ENTER_METHOD();</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_PRINT("info", ("mroonga: n_keys=%u", n_keys));</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- mrn_lock_type != F_UNLCK || !(error = wrapper_external_lock(thd, F_WRLCK))</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ mrn_lock_type != F_UNLCK ||</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#ifdef MRN_NEED_M_LOCK_TYPE_CHECK_FOR_WRAPPER_EXTERNAL_LOCK</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ wrapper_lock_type_backup != F_UNLCK ||</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">+ !(error = wrapper_external_lock(thd, F_WRLCK))</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 (</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> !(error = wrapper_start_stmt(thd, thr_lock_data.type)) &&</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -12668,7 +12679,12 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::wrapper_fill_indexes(THD *thd, KEY *key_info,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> else</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> error = wrapper_rnd_end();</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">- if (mrn_lock_type == F_UNLCK)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#ifdef MRN_NEED_M_LOCK_TYPE_CHECK_FOR_WRAPPER_EXTERNAL_LOCK</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ wrapper_lock_type_backup == F_UNLCK &&</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">+ mrn_lock_type == F_UNLCK</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"> wrapper_external_lock(thd, F_UNLCK);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_RETURN(error);</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>