<!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">Naoya Murakami <visio****@gmail*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2017-08-17 07:38:29 +0900 (Thu, 17 Aug 2017)</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040">2ac2d7de92e73f7e0706f3d0f42ec0df7513d040</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Merge</dt>
<dd style="margin-left: 8.5em">
<ul>
<li>Merged <a href="https://github.com/mroonga/mroonga/commit/1d8f294">1d8f294</a>: Merge pull request <a href="https://github.com/mroonga/mroonga/issues/163">#163</a> from naoa/support-inplace-alter-table-for-stored-generated-column</li>
</ul>
</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">Add compatible code</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2">ha_mroonga.cpp</a></li>
<li><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71">mrn_mysql_compat.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; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: ha_mroonga.cpp (+1 -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; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2L15183">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2L15184">15184</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2L15185">15185</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2L15186">15186</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2L15187">15187</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2L15188">15188</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2L15189">15189</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2L15190">15190</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2R15183">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2R15184">15184</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2R15185">15185</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2R15186">15186</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2R15187">15187</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2R15188">15188</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2R15189">15189</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-ba714ec217aa6836e39b3aea9da57ae2R15190">15190</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">@@ -15184,7 +15184,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">bool ha_mroonga::storage_inplace_alter_table_add_column(</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> GRN_VOID_INIT(&new_value);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> while (!(error = storage_rnd_next(table->record[0]))) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #ifdef MRN_MARIADB_P</span>
<span class="diff-deleted" style="background-color: #ffecec; color: #000000; display: block; white-space: pre">- altered_table<span class="diff-deleted-word" style="background-color: #f8cbcb; color: #000000">->update_virtual_field(</span>altered_field);</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ <span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">MRN_GENERATED_COLUMNS_UPDATE_VIRTUAL_FIELD(</span>altered_table<span class="diff-added-word" style="background-color: #a6f3a6; color: #000000">, </span>altered_field);</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"> if (update_generated_write_fields(&generated_column_bitmap, altered_table)) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> error = ER_WRONG_COLUMN_NAME;</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; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: mrn_mysql_compat.h (+10 -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; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71L467">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71L468">468</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71L469">469</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71L470">470</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-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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71L471">471</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R467">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R468">468</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R469">469</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R470">470</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R471">471</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R472">472</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R473">473</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R474">474</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R475">475</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R476">476</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R477">477</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R478">478</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R479">479</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/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R480">480</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/2ac2d7de92e73f7e0706f3d0f42ec0df7513d040#diff-b2c9ca22203d999ad908b68f261c0e71R481">481</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">@@ -468,4 +468,14 @@</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"> #endif</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </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 >= 100203)</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+# define MRN_GENERATED_COLUMNS_UPDATE_VIRTUAL_FIELD(table, field) \</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ (table->update_virtual_field(field))</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_GENERATED_COLUMNS_UPDATE_VIRTUAL_FIELD(table, field) \</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+ (field->vcol_info->expr_item->save_in_field(field, 0))</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+# endif</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+#endif</span>
<span class="diff-added" style="background-color: #eaffea; color: #000000; display: block; white-space: pre">+</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #endif /* MRN_MYSQL_COMPAT_H_ */</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>