<!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-10-04 17:29:10 +0900 (Thu, 04 Oct 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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c">5c665fe62841a0c8a389e82f247cb7c83cc2c10c</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">Reduce variable scope</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#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 (+6 -6)</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12898">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12899">12899</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12900">12900</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12901">12901</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12902">12902</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12903">12903</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12904">12904</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12905">12905</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12906">12906</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12907">12907</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12908">12908</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12909">12909</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12910">12910</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12911">12911</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12922">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12923">12923</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12924">12924</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12925">12925</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12926">12926</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12927">12927</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0L12928">12928</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12898">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12899">12899</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12900">12900</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12901">12901</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12902">12902</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12903">12903</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12904">12904</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12905">12905</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12906">12906</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12917">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12918">12918</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12919">12919</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12920">12920</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12921">12921</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12922">12922</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12923">12923</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12924">12924</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/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12925">12925</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12926">12926</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12927">12927</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5c665fe62841a0c8a389e82f247cb7c83cc2c10c#L0R12928">12928</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">@@ -12899,13 +12899,8 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">bool ha_mroonga::check_written_by_row_based_binlog()</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</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"> THD *thd = ha_thd();</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- int current_stmt_binlog_row;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-#ifdef _WIN32</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- unsigned __int64 option_bits;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-#else</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- uint64 option_bits;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; 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">+ int current_stmt_binlog_row;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #ifdef MRN_ROW_BASED_CHECK_IS_METHOD</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> current_stmt_binlog_row = thd->is_current_stmt_binlog_format_row();</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">@@ -12923,6 +12918,11 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">bool ha_mroonga::check_written_by_row_based_binlog()</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_RETURN(false);</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-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#ifdef _WIN32</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ unsigned __int64 option_bits;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+#else</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ uint64 option_bits;</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"> #ifdef MRN_OPTION_BITS_IS_UNDER_VARIABLES</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> option_bits = thd->variables.option_bits & OPTION_BIN_LOG;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #else</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>