<!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-04-20 21:59:42 +0900 (Fri, 20 Apr 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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a">bf2371fd5200405f6f4a42e5699a3be6e0c07b3a</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Merge</dt>
<dd style="margin-left: 8.5em">
<ul>
<li>Merged d2a70dc: Merge branch 'master' of github.com:mroonga/mroonga</li>
</ul>
</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">Use static grn_ctx allocation instead of dynamic allocation</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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#diff-0">ha_mroonga.cpp</a></li>
<li><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#diff-1">ha_mroonga.hpp</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 (+3 -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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1680">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1681">1681</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1682">1682</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1683">1683</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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1684">1684</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1685">1685</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1686">1686</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1714">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1715">1715</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1716">1716</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1717">1717</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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1718">1718</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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1719">1719</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1720">1720</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0L1721">1721</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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1680">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1681">1681</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1682">1682</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1683">1683</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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1684">1684</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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1685">1685</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1686">1686</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1687">1687</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1688">1688</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1716">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1717">1717</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1718">1718</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1719">1719</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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1720">1720</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1721">1721</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1722">1722</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L0R1723">1723</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">@@ -1681,6 +1681,8 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">ha_mroonga::ha_mroonga(handlerton *hton, TABLE_SHARE *share_arg)</span></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"> mrn_lock_type(F_UNLCK),</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">+ ctx_entity_(),</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ ctx(&ctx_entity_),</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_table(NULL),</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_columns(NULL),</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_index_tables(NULL),</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1715,7 +1717,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">ha_mroonga::ha_mroonga(handlerton *hton, TABLE_SHARE *share_arg)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> replacing_(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"> MRN_DBUG_ENTER_METHOD();</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- ctx = grn_ctx_open(0);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ grn_ctx_init(ctx, 0);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mrn_change_encoding(ctx, system_charset_info);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_ctx_use(ctx, mrn_db);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> GRN_WGS84_GEO_POINT_INIT(&top_left_point, 0);</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"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: ha_mroonga.hpp (+1 -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"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1L187">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1L188">188</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1L189">189</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1L190">190</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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1L191">191</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1L192">192</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1L193">193</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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1R187">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1R188">188</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1R189">189</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1R190">190</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/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1R191">191</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1R192">192</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1R193">193</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/bf2371fd5200405f6f4a42e5699a3be6e0c07b3a#L1R194">194</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">@@ -188,6 +188,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">private:</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int mrn_lock_type;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> // for groonga objects</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ grn_ctx ctx_entity_;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_ctx *ctx;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_obj *grn_table;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_obj **grn_columns;</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>