<!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 10:56:25 +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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd">037a7f6704b2b158dd7a201159a10a7ae7c9efcd</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">storage mariadb: fix a memory leak for mroonga_log_file
A variable that has PLUGIN_VAR_MEMALLOC flag should be freed on
MariaDB.</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#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 (+10 -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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L604">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L605">605</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L606">606</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L607">607</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L608">608</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L609">609</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L610">610</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L611">611</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L612">612</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L613">613</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L614">614</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L615">615</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L620">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L621">621</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L622">622</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L623">623</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L624">624</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L625">625</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L626">626</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L627">627</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0L628">628</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R604">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R605">605</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R606">606</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R607">607</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R608">608</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R609">609</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R610">610</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R611">611</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R612">612</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R613">613</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R614">614</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R615">615</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R616">616</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R621">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R622">622</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R623">623</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R624">624</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R625">625</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R626">626</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R627">627</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R628">628</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R629">629</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R630">630</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R631">631</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R632">632</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/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R633">633</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R634">634</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R635">635</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/037a7f6704b2b158dd7a201159a10a7ae7c9efcd#L0R636">636</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">@@ -605,11 +605,12 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">static void mrn_log_file_update(THD *thd, struct st_mysql_sys_var *var,</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"> }</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">+ const char *new_log_file_name;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (log_file_open_errno == 0) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> GRN_LOG(&ctx, GRN_LOG_NOTICE,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "log file is changed: <%s> -> <%s>",</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> *old_value_ptr, new_value);</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- *old_value_ptr = my_strdup(new_value, MYF(MY_WME));</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ new_log_file_name = new_value;</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"> if (mrn_log_file) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> GRN_LOG(&ctx, GRN_LOG_ERROR,</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -621,8 +622,15 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">static void mrn_log_file_update(THD *thd, struct st_mysql_sys_var *var,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "log file can't be opened: <%s>: <%s>",</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> new_value, strerror(log_file_open_errno));</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">- *old_value_ptr = my_strdup(*old_value_ptr, MYF(MY_WME));</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ new_log_file_name = *old_value_ptr;</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 MRN_NEED_FREE_STRING_MEMALLOC_PLUGIN_VAR</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ char *old_log_file_name = *old_value_ptr;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ *old_value_ptr = my_strdup(new_log_file_name, MYF(MY_WME));</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ my_free(old_log_file_name, MYF(0));</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">+ *old_value_ptr = new_log_file_name;</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"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_ctx_fin(&ctx);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>