<!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-03-17 21:58:15 +0900 (Tue, 17 Mar 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/f0934d49b3d847458ff7daae8b612ea555c8688d">f0934d49b3d847458ff7daae8b612ea555c8688d</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">mysql57: support PSI_memory_key for my_multi_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/f0934d49b3d847458ff7daae8b612ea555c8688d#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 (+3 -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/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L776">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L777">777</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L778">778</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L779">779</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/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L780">780</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/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L781">781</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L782">782</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L783">783</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L825">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L826">826</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L827">827</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L828">828</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/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L829">829</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/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L830">830</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L831">831</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L832">832</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L1068">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L1069">1069</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L1070">1070</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L1071">1071</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/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L1072">1072</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/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L1073">1073</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L1074">1074</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0L1075">1075</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/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R776">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R777">777</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R778">778</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R779">779</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/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R780">780</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R781">781</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R782">782</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R783">783</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R825">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R826">826</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R827">827</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R828">828</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/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R829">829</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R830">830</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R831">831</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R832">832</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R1068">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R1069">1069</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R1070">1070</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R1071">1071</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/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R1072">1072</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R1073">1073</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R1074">1074</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f0934d49b3d847458ff7daae8b612ea555c8688d#L0R1075">1075</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">@@ -777,7 +777,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">MRN_LONG_TERM_SHARE *mrn_get_long_term_share(const char *table_name,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> table_name_length)))</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (!(long_term_share = (MRN_LONG_TERM_SHARE *)</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ mrn_my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> &long_term_share, sizeof(*long_term_share),</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> &tmp_name, table_name_length + 1,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> NullS))</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -826,7 +826,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">MRN_SHARE *mrn_get_share(const char *table_name, TABLE *table, int *error)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> (uchar*) table_name, length)))</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (!(share = (MRN_SHARE *)</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ mrn_my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> &share, sizeof(*share),</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> &tmp_name, length + 1,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> &index_table, sizeof(char *) * table->s->keys,</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1069,7 +1069,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">KEY *mrn_create_key_info_for_table(MRN_SHARE *share, TABLE *table, int *error)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (share->wrap_keys)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (!(wrap_key_info = (KEY *)</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ mrn_my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> &wrap_key_info, sizeof(*wrap_key_info) * share->wrap_keys,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> NullS))</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ) {</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>