<!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">2012-03-18 16:58:16 +0900 (Sun, 18 Mar 2012)</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/f22888f33bdbccd1fb40d313817564b4e7bcc537">f22888f33bdbccd1fb40d313817564b4e7bcc537</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">i386 multiple column index: disable optimization
Those tests are failed with gcc 4.1.2 -O2 on CentOS 5.8 i686:
mroonga_storage.multiple_column_index_select_double
mroonga_storage.multiple_column_index_select_float
We need to disable optimization by volatile.
Reported by Kazuhiko Shiozaki. Thanks!!!</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#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 (+7 -5)</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L8878">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L8879">8879</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L8880">8880</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L8881">8881</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L8882">8882</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L8883">8883</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L8884">8884</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L8885">8885</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L8886">8886</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L8887">8887</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L8888">8888</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L9052">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L9053">9053</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L9054">9054</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L9055">9055</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L9056">9056</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L9057">9057</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L9058">9058</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0L9059">9059</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R8878">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R8879">8879</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R8880">8880</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R8881">8881</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-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R8882">8882</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R8883">8883</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R8884">8884</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R8885">8885</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R8886">8886</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R8887">8887</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R8888">8888</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R9052">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R9053">9053</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R9054">9054</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R9055">9055</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R9056">9056</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R9057">9057</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/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R9058">9058</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R9059">9059</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R9060">9060</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/f22888f33bdbccd1fb40d313817564b4e7bcc537#L0R9061">9061</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">@@ -8879,10 +8879,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_encode_multiple_column_key(KEY *key_info,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> TYPE_BYTE_SEQUENCE</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> } data_type = TYPE_UNKNOWN;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> uint32 data_size = 0;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- int int_value = 0;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- long long int long_long_value = 0;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- float float_value = 0.0;</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- double double_value = 0.0;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ volatile int int_value = 0;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ volatile long long int long_long_value = 0;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ volatile float float_value = 0.0;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ volatile double double_value = 0.0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> switch (field->real_type()) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> case MYSQL_TYPE_DECIMAL:</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> data_type = TYPE_BYTE_SEQUENCE;</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -9053,7 +9053,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">int ha_mroonga::storage_encode_multiple_column_key(KEY *key_info,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> case TYPE_DOUBLE:</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> int n_bits = (data_size * 8 - 1);</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- long_long_value = *((long long int *)(&double_value));</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ volatile long long int *encoded_value_pointer =</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ (long long int *)(&double_value);</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ long_long_value = *encoded_value_pointer;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (!decode)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> long_long_value ^= ((long_long_value >> n_bits) | (1LL << n_bits));</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mrn_byte_order_host_to_network(current_buffer, &long_long_value,</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>