<!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">2014-07-22 23:58:30 +0900 (Tue, 22 Jul 2014)</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3">c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3</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">storage: use consistency style</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#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 (+8 -5)</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13690">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13691">13691</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13692">13692</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13693">13693</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13694">13694</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13695">13695</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13696">13696</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13697">13697</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13700">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13701">13701</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13702">13702</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13703">13703</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13704">13704</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13705">13705</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13706">13706</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13707">13707</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13708">13708</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13709">13709</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13710">13710</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13711">13711</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13712">13712</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13713">13713</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13714">13714</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13715">13715</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13716">13716</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13717">13717</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13718">13718</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13719">13719</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13720">13720</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13721">13721</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13722">13722</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13723">13723</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13724">13724</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0L13725">13725</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13690">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13691">13691</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13692">13692</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13693">13693</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13694">13694</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13695">13695</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13696">13696</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13699">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13700">13700</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13701">13701</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13702">13702</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13703">13703</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13704">13704</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13705">13705</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13706">13706</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13707">13707</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13708">13708</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13709">13709</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13710">13710</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13711">13711</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13712">13712</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13713">13713</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13714">13714</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13715">13715</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13716">13716</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13717">13717</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13718">13718</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13719">13719</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13720">13720</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13721">13721</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13722">13722</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13723">13723</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13724">13724</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/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13725">13725</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13726">13726</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13727">13727</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/c1e64ddbfc4d32a4870c4e70ccf82753e114d6a3#L0R13728">13728</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">@@ -13691,7 +13691,6 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">bool ha_mroonga::storage_inplace_alter_table(</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int error = mrn_change_encoding(ctx, system_charset_info);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (error) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> have_error = true;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- DBUG_RETURN(have_error);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Alter_inplace_info::HA_ALTER_FLAGS index_related_flags =</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -13701,25 +13700,29 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">bool ha_mroonga::storage_inplace_alter_table(</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Alter_inplace_info::DROP_UNIQUE_INDEX |</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Alter_inplace_info::ADD_PK_INDEX |</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Alter_inplace_info::DROP_PK_INDEX;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- if (ha_alter_info->handler_flags & index_related_flags) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (!have_error &&</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ (ha_alter_info->handler_flags & index_related_flags)) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> have_error = storage_inplace_alter_table_index(altered_table, ha_alter_info);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Alter_inplace_info::HA_ALTER_FLAGS add_column_related_flags =</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Alter_inplace_info::ADD_COLUMN;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- if (!have_error && ha_alter_info->handler_flags & add_column_related_flags) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (!have_error &&</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ (ha_alter_info->handler_flags & add_column_related_flags)) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> have_error = storage_inplace_alter_table_add_column(altered_table, ha_alter_info);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Alter_inplace_info::HA_ALTER_FLAGS drop_column_related_flags =</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Alter_inplace_info::DROP_COLUMN;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- if (!have_error && ha_alter_info->handler_flags & drop_column_related_flags) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (!have_error &&</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ (ha_alter_info->handler_flags & drop_column_related_flags)) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> have_error = storage_inplace_alter_table_drop_column(altered_table, ha_alter_info);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Alter_inplace_info::HA_ALTER_FLAGS rename_column_related_flags =</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Alter_inplace_info::ALTER_COLUMN_NAME;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- if (!have_error && ha_alter_info->handler_flags & rename_column_related_flags) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (!have_error &&</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ (ha_alter_info->handler_flags & rename_column_related_flags)) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> have_error = storage_inplace_alter_table_rename_column(altered_table, ha_alter_info);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>