<!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">2015-02-17 00:00:23 +0900 (Tue, 17 Feb 2015)</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71">4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71</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">Use copied path for normalized_path
Because normalized_path may be changed in `open_table_def()`.</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#diff-0">mrn_table.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: mrn_table.cpp (+5 -3)</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1029">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1030">1030</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1031">1031</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1032">1032</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1033">1033</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1034">1034</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1035">1035</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1036">1036</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1037">1037</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1038">1038</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1043">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1044">1044</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1045">1045</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1046">1046</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1047">1047</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1048">1048</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1049">1049</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0L1050">1050</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1029">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1030">1030</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1031">1031</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1032">1032</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-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1033">1033</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1034">1034</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1035">1035</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1036">1036</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1037">1037</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1038">1038</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1043">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1044">1044</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1045">1045</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1046">1046</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1047">1047</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1048">1048</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/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1049">1049</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1050">1050</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1051">1051</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/4ca64bcd7a99d18b7bf5fe68ad6ff22161270a71#L0R1052">1052</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">@@ -1030,9 +1030,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">TABLE_SHARE *mrn_create_tmp_table_share(TABLE_LIST *table_list, const char *path</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"> share->tmp_table = INTERNAL_TMP_TABLE; // TODO: is this right?</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> share->path.str = (char *) path;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- share->path.length = strlen(path);</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- share->normalized_path.str = share->path.str;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- share->normalized_path.length = share->path.length;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ share->path.length = strlen(share->path.str);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ share->normalized_path.str = my_strdup(path, MYF(MY_WME));</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ share->normalized_path.length = strlen(share->normalized_path.str);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (open_table_def(thd, share, GTS_TABLE))</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 = ER_CANT_OPEN_FILE;</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1044,7 +1044,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">TABLE_SHARE *mrn_create_tmp_table_share(TABLE_LIST *table_list, const char *path</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> void mrn_free_tmp_table_share(TABLE_SHARE *tmp_table_share)</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_FUNCTION();</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ char *normalized_path = tmp_table_share->normalized_path.str;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> free_table_share(tmp_table_share);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ my_free(normalized_path);</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>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>