<!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-11-01 00:37:35 +0900 (Tue, 01 Nov 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/334588480212f8e6840bd1e03910fa07376c7658">334588480212f8e6840bd1e03910fa07376c7658</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">allocate default_parser memory in mrn_init() with my_malloc().</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/334588480212f8e6840bd1e03910fa07376c7658#diff-0">ha_mroonga.cc</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 (+5 -4)</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/334588480212f8e6840bd1e03910fa07376c7658#L0L108">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L109">109</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L110">110</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L111">111</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/334588480212f8e6840bd1e03910fa07376c7658#L0L112">112</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L113">113</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L114">114</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L115">115</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L227">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L228">228</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L229">229</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L230">230</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/334588480212f8e6840bd1e03910fa07376c7658#L0L231">231</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/334588480212f8e6840bd1e03910fa07376c7658#L0L232">232</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/334588480212f8e6840bd1e03910fa07376c7658#L0L233">233</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L234">234</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L235">235</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L236">236</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/334588480212f8e6840bd1e03910fa07376c7658#L0L237">237</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/334588480212f8e6840bd1e03910fa07376c7658#L0L238">238</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L239">239</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L240">240</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L1009">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L1010">1010</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L1011">1011</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L1012">1012</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L1013">1013</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L1014">1014</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0L1015">1015</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/334588480212f8e6840bd1e03910fa07376c7658#L0R108">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R109">109</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R110">110</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R111">111</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/334588480212f8e6840bd1e03910fa07376c7658#L0R112">112</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R113">113</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R114">114</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R226">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R227">227</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R228">228</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R229">229</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/334588480212f8e6840bd1e03910fa07376c7658#L0R230">230</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R231">231</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R232">232</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R233">233</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R234">234</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/334588480212f8e6840bd1e03910fa07376c7658#L0R235">235</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R236">236</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R237">237</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R238">238</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R1007">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R1008">1008</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R1009">1009</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R1010">1010</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/334588480212f8e6840bd1e03910fa07376c7658#L0R1011">1011</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/334588480212f8e6840bd1e03910fa07376c7658#L0R1012">1012</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/334588480212f8e6840bd1e03910fa07376c7658#L0R1013">1013</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R1014">1014</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R1015">1015</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/334588480212f8e6840bd1e03910fa07376c7658#L0R1016">1016</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">@@ -109,7 +109,6 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">FILE *mrn_logfile = NULL;</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> static bool mrn_logfile_opened = false;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_log_level mrn_log_level_default = GRN_LOG_DEFAULT_LEVEL;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ulong mrn_log_level = (ulong) mrn_log_level_default;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-char mrn_default_parser_name[MRN_MAX_KEY_SIZE];</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> char *mrn_default_parser;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> static void mrn_logger_func(int level, const char *time, const char *title,</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -228,13 +227,12 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">static void mrn_default_parser_update(THD *thd, struct st_mysql_sys_var *var,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "default parser changed from '%s' to '%s'",</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> old_value, new_value);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> grn_ctx_fin(&ctx);</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- strcpy(mrn_default_parser_name, new_value);</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- mrn_default_parser = mrn_default_parser_name;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ strncpy(mrn_default_parser, new_value, MRN_MAX_KEY_SIZE - 1);</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-not-changed" style="display: block; white-space: pre"> static MYSQL_SYSVAR_STR(default_parser, mrn_default_parser,</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- PLUGIN_VAR_RQCMDARG,</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_MEMALLOC,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "default fulltext parser",</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> NULL,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mrn_default_parser_update,</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1010,6 +1008,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">static int mrn_init(void *p)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> goto error_allocated_open_tables_hash_init;</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">+ mrn_default_parser = (char *)my_malloc(MRN_MAX_KEY_SIZE, MYF(MY_WME));</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ strncpy(mrn_default_parser, MRN_PARSER_DEFAULT, MRN_MAX_KEY_SIZE - 1);</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"> return 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> error_allocated_open_tables_hash_init:</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>