<!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">2012-11-19 19:01:23 +0900 (Mon, 19 Nov 2012)</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c">3fbe64c5412ebfefc28cc9e0196645fc5569007c</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">mysql56 wrapper: use copy based alter table for now
refs #1548</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#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"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: ha_mroonga.cpp (+11 -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"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0L11648">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0L11649">11649</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0L11650">11650</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0L11651">11651</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0L11652">11652</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0L11653">11653</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-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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0L11654">11654</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0L11655">11655</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0L11656">11656</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11648">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11649">11649</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11650">11650</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11651">11651</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11652">11652</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11653">11653</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11654">11654</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11655">11655</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11656">11656</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11657">11657</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11658">11658</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11659">11659</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11660">11660</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11661">11661</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11662">11662</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/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11663">11663</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11664">11664</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11665">11665</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3fbe64c5412ebfefc28cc9e0196645fc5569007c#L0R11666">11666</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">@@ -11649,8 +11649,18 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">enum_alter_inplace_result ha_mroonga::wrapper_check_if_supported_inplace_alter(</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> TABLE *altered_table,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Alter_inplace_info *ha_alter_info)</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">- enum_alter_inplace_result result;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> MRN_DBUG_ENTER_METHOD();</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">+ uint n_keys = altered_table->s->keys;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ for (uint i = 0; i < n_keys; ++i) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ const KEY *key = &(altered_table->key_info[i]);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (key->flags & HA_FULLTEXT || mrn_is_geo_key(key)) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ // TODO: Use HA_ALTER_INPLACE_SHARED_LOCK instead of NOT_SUPPORTED</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);</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">+ }</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">+ enum_alter_inplace_result result;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> MRN_SET_WRAP_SHARE_KEY(share, table->s);</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"> result = wrap_handler->check_if_supported_inplace_alter(altered_table,</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>