<!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">2011-09-24 23:24:53 +0900 (Sat, 24 Sep 2011)</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/5faaf8539060e639428c132c5a4c1554ed13774e">5faaf8539060e639428c132c5a4c1554ed13774e</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">[storage] use independent result table for geometory search.</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/5faaf8539060e639428c132c5a4c1554ed13774e#diff-0">ha_mroonga.cc</a></li>
<li><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#diff-1">ha_mroonga.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"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: ha_mroonga.cc (+10 -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"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L1172">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L1173">1173</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L1174">1174</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L1175">1175</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0L1176">1176</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L1177">1177</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L1178">1178</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L4175">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L4176">4176</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L4177">4177</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L4178">4178</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0L4179">4179</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0L4180">4180</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0L4181">4181</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0L4182">4182</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0L4183">4183</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L4184">4184</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L4185">4185</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5183">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5184">5184</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5185">5185</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5186">5186</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5187">5187</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5188">5188</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5189">5189</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5196">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5197">5197</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5198">5198</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5199">5199</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5200">5200</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5201">5201</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5202">5202</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5203">5203</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5204">5204</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0L5205">5205</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0R1172">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R1173">1173</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R1174">1174</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R1175">1175</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0R1176">1176</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R1177">1177</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R1178">1178</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R1179">1179</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R4176">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R4177">4177</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R4178">4178</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R4179">4179</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-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R4180">4180</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0R4181">4181</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R4182">4182</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0R4183">4183</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R4184">4184</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R4185">4185</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R4186">4186</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5184">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5185">5185</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5186">5186</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5187">5187</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5188">5188</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5189">5189</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5190">5190</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5191">5191</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5192">5192</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5193">5193</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5194">5194</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5201">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5202">5202</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5203">5203</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5204">5204</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5205">5205</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5206">5206</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/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5207">5207</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5208">5208</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5209">5209</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L0R5210">5210</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">@@ -1173,6 +1173,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">ha_mroonga::ha_mroonga(handlerton *hton, TABLE_SHARE *share)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> index_table_cursor = NULL;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> result = NULL;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> result0 = NULL;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ result_geo = NULL;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> score_column = NULL;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> share = NULL;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> is_clone = FALSE;</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -4176,10 +4177,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_index_read_map_geo(uchar *buf, const uchar *key,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int error = 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int flags = 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (find_flag & HA_READ_MBR_CONTAIN) {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- result = storage_geo_select_in_rectangle(grn_index_columns[active_index],</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- key);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ result_geo = storage_geo_select_in_rectangle(grn_index_columns[active_index],</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ key);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> // TODO: check result</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- cursor = grn_table_cursor_open(ctx, result, NULL, 0, NULL, 0,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ cursor = grn_table_cursor_open(ctx, result_geo, NULL, 0, NULL, 0,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> 0, -1, flags);</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"> push_warning_unsupported_spatial_index_search(find_flag);</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -5184,6 +5185,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">void ha_mroonga::clear_search_result()</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_obj_unlink(ctx, result);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> result = NULL;</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">+ if (result_geo) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ grn_obj_unlink(ctx, result_geo);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ result_geo = NULL;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_VOID_RETURN;</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-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -5197,9 +5202,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_get_next_record(uchar *buf)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> clear_search_result();</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> DBUG_RETURN(error);</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">- if (result && record_id) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (result_geo && record_id) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_id real_record_id;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- if (grn_table_get_key(ctx, result, record_id,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (grn_table_get_key(ctx, result_geo, record_id,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> &real_record_id, sizeof(real_record_id))) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> record_id = real_record_id;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> } else {</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.h (+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/5faaf8539060e639428c132c5a4c1554ed13774e#L1L128">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L1L129">129</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L1L130">130</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L1L131">131</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/5faaf8539060e639428c132c5a4c1554ed13774e#L1L132">132</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L1L133">133</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L1L134">134</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/5faaf8539060e639428c132c5a4c1554ed13774e#L1R128">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L1R129">129</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L1R130">130</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L1R131">131</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/5faaf8539060e639428c132c5a4c1554ed13774e#L1R132">132</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L1R133">133</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L1R134">134</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/5faaf8539060e639428c132c5a4c1554ed13774e#L1R135">135</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">@@ -129,6 +129,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"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_obj *result;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_obj *result0;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ grn_obj *result_geo;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_table_cursor *cursor;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_table_cursor *index_table_cursor;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_id record_id;</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>