<!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">2013-09-25 18:16:40 +0900 (Wed, 25 Sep 2013)</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/8c2e955de2bd6b3209e818150ef188297d17fd1f">8c2e955de2bd6b3209e818150ef188297d17fd1f</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">Fix wrong context used for error check of opening database</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/8c2e955de2bd6b3209e818150ef188297d17fd1f#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 (+2 -2)</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/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0L3662">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0L3663">3663</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0L3664">3664</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0L3665">3665</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/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0L3666">3666</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/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0L3667">3667</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0L3668">3668</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/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0L3669">3669</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/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0L3670">3670</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0L3671">3671</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0L3672">3672</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/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0R3662">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0R3663">3663</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0R3664">3664</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0R3665">3665</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/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0R3666">3666</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0R3667">3667</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0R3668">3668</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/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0R3669">3669</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0R3670">3670</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0R3671">3671</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/8c2e955de2bd6b3209e818150ef188297d17fd1f#L0R3672">3672</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">@@ -3663,10 +3663,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::ensure_database_open(const char *name)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mrn::Lock lock(&mrn_db_mutex);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (!mrn_hash_get(&mrn_ctx, mrn_hash, mapper.db_name(), &db)) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> db = grn_db_open(&mrn_ctx, mapper.db_path());</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- if (ctx->rc) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (mrn_ctx.rc) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> pthread_mutex_unlock(&mrn_db_mutex);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> error = ER_CANT_OPEN_FILE;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- my_message(error, ctx->errbuf, MYF(0));</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ my_message(error, mrn_ctx.errbuf, MYF(0));</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-not-changed" style="display: block; white-space: pre"> mrn_hash_put(&mrn_ctx, mrn_hash, mapper.db_name(), db);</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>