<!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">2016-04-19 17:22:07 +0900 (Tue, 19 Apr 2016)</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/4c9f91223bb09dd27d124babf850d5cf74705881">4c9f91223bb09dd27d124babf850d5cf74705881</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">mariadb10.2: follow ORDER::direction 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/4c9f91223bb09dd27d124babf850d5cf74705881#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 (+11 -3)</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2L144">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2L145">145</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2L146">146</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2L147">147</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2L148">148</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2L149">149</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2L150">150</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2L151">151</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2L152">152</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2L153">153</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2L154">154</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R144">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R145">145</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R146">146</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R147">147</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-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R148">148</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R149">149</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R150">150</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R151">151</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R152">152</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R153">153</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R154">154</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R155">155</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R156">156</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R157">157</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R158">158</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/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R159">159</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R160">160</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R161">161</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4c9f91223bb09dd27d124babf850d5cf74705881#diff-ba714ec217aa6836e39b3aea9da57ae2R162">162</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">@@ -145,10 +145,18 @@ <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_NEED_M_LOCK_TYPE_CHECK_FOR_WRAPPER_EXTERNAL_LOCK</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-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">-#if MYSQL_VERSION_ID >= 50603 && !defined(MRN_MARIADB_P)</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">-# define MRN_ORDER_IS_ASC(order) ((order)->direction == ORDER::ORDER_ASC)</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+#ifdef MRN_MARIADB_P</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+# if MYSQL_VERSION_ID >= 100200</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+# define MRN_ORDER_IS_ASC(order) ((order)->direction == ORDER::ORDER_ASC)</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+# else</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+# define MRN_ORDER_IS_ASC(order) ((order)->asc)</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+# endif</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #else</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">-# define MRN_ORDER_IS_ASC(order) ((order)->asc)</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+# if MYSQL_VERSION_ID >= 50603</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+# define MRN_ORDER_IS_ASC(order) ((order)->direction == ORDER::ORDER_ASC)</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+# else</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+# define MRN_ORDER_IS_ASC(order) ((order)->asc)</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+# endif</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"> #define MRN_STRINGIFY(macro_or_string) MRN_STRINGIFY_ARG(macro_or_string)</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>