<!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 &lt;kou****@clear*****&gt;</dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
      <dd style="margin-left: 8.5em">2011-09-24 18:43:36 +0900 (Sat, 24 Sep 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/e0750d696826ee7cb2da065c3a080f3b90dfa48a">e0750d696826ee7cb2da065c3a080f3b90dfa48a</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, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; padding: 0.5em">[storage] return error code for unsupported key type.

TODO: callers should check it.</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/e0750d696826ee7cb2da065c3a080f3b90dfa48a#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, &quot;Liberation Mono&quot;, 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 (+4 -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, &quot;Liberation Mono&quot;, 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/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L698">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L699">699</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L700">700</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L701">701</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L702">702</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L703">703</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L704">704</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L777">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#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/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L779">779</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L780">780</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/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L781">781</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L782">782</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/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L783">783</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L784">784</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L785">785</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0L786">786</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R698">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R699">699</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R700">700</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R701">701</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/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R702">702</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R703">703</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R704">704</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R705">705</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R778">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R779">779</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#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/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R781">781</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R782">782</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/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R783">783</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R784">784</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</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/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R785">785</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R786">786</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R787">787</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/e0750d696826ee7cb2da065c3a080f3b90dfa48a#L0R788">788</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, 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">@@ -699,6 +699,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">static uchar *mrn_multiple_column_key_encode(KEY *key_info,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> static int mrn_set_key_buf(grn_ctx *ctx, Field *field,</span>
<span class="diff-not-changed" style="display: block; white-space: pre">                            const uchar *key, uchar *buf, uint *size)</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">+  int error = 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   char *ptr = (char*) key;</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 (field-&gt;null_bit != 0x0) {</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -778,9 +779,10 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">static int mrn_set_key_buf(grn_ctx *ctx, Field *field,</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">       break;</span>
<span class="diff-not-changed" style="display: block; white-space: pre">     }</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   default:</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-    return -1;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+    error = HA_ERR_UNSUPPORTED;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+    break;</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">-  return 0;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+  return error;</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 void mrn_store_field(grn_ctx *ctx, Field *field, grn_obj *col, grn_id id)</span>
</pre>
            </td>
          </tr>
        </tbody>
      </table>
    </div>
  </body>
</html>