Merge lp:~kazuhiko/maria/5.3-groonga into lp:maria/5.3

[Kazuhiko]

bundle storage/mroonga and extra/groonga.

This is my second request of merging after including the latest stable release of the groonga library and the mroonga (groonga storage engine).

I hope that it is included in the comming 5.3-RC release.

The description copied from the first request below:

Mroonga (groonga storage engine for MySQL/MariaDB) and groonga library that is its requirement are added in this branch.
There are two suites of tests and all of them should pass.

Two configure options are added :

+ --without-groonga Use system groonga instead of bundled copy.
+ --with-groonga-default-parser=PARSER
+ specify the default fulltext parser for groonga
+ storage engine like
+ --with-groonga-default-parser=TokenMecab.
(default:
+ TokenBigram)

The first one, '--without-groonga', I don't like this naming, but it
follows the existing '--without-readline' and '--without-libedit' options.

Here is the summary of changes :

configure.in : groonga/mroonga configurations are added
extra/groonga : groonga library is added here
mysql-test/suite/groonga_storage : tests for mroonga's storage mode
mysql-test/suite/groonga_wrapper : tests for mroonga's wrapper mode
storage/mroonga : mroonga, that is groonga storage engine, is added here

The contents inside extra/groonga and storage/mroonga are under LGPL.
For the changes in configure.in, I am ready to sign MCA if needed.

Kazuhiko Shiozaki

[lp:~kazuhiko/maria/5.3-groonga]

3324. By Igor Babaev on 2011-11-30

Fixed LP bug #898073.
The tables from the same semi-join or outer join nest cannot use
join buffers if in the join sequence of the query execution plan
they are separated by a table that is planned to be joined without
usage of a join buffer.

3325. By Michael Widenius on 2011-12-01

Patch to get MariaDB to compile on CYGWIN; By Guenter Knauf
Increased number of locks in thr_lock (used only when testing)

3326. By Michael Widenius on 2011-12-01

Fixes for netware by Guenter Knauf

3327. By Michael Widenius on 2011-12-01

Added new file (for netware)
Added some file to ignore

3328. By Igor Babaev on 2011-12-04

Fixed LP bug #899696.
If has been decided that the first match strategy is to be used to join table T
from a semi-join nest while no buffer can be employed to join this table
then no join buffer can be used to join any table in the join sequence between
the first one belonging to the semi-join nest and table T.

3329. By Sergey Petrunia on 2011-12-04

Make subquery Materialization, as well as semi-join Materialization be shown
in EXPLAIN as select_type==MATERIALIZED.

Before, we had select_type==SUBQUERY and it was difficult to tell materialized
subqueries from uncorrelated scalar-context subqueries.

3330. By Sergey Petrunia on 2011-12-05

Update test result missed in the previous cset

3331. By Sergey Petrunia on 2011-12-05

Bug #899962: materialized subquery with join_cache_level=3
- Make create_tmp_table() set KEY_PART_INFO attributes for the keys it creates.
  This wasn't needed before but is needed now, when temp. tables that are
  results of SJ-Materialization are being used for joins.
  This particular bug depended on HA_VAR_LENGTH_PART being set,
  but also added code to set HA_BLOB_PART and HA_NULL_PART when appropriate.

3332. By Igor Babaev on 2011-12-06

Merge

3333. By Igor Babaev on 2011-12-06

Fixed LP bug #899509.
The optimizer must ignore any possible hash join key when looking for the
query execution plan with join_cache_level set to 0.

3334. By Igor Babaev on 2011-12-06

Fixed LP bug #900469.
The execution plan cannot use sorting on the first table from the
sequence of the joined tables if it plans to employ the block-based
hash join algorithm.

3335. By Sergey Petrunia on 2011-12-07

BUG#901032: Wrong result for MIN/MAX on an indexed column with materialization and semijoin
- opt_sum_query() should not assume that join tables from sj-materialization
  have known numbers of rows.

3336. By Sergey Petrunia on 2011-12-07

Merge fix for BUG#868908

3337. By Sergey Petrunia on 2011-12-08

Small semi-join optimization improvement:
- if we're considering FirstMatch access with one inner table, and
  @@optimizer_switch has semijoin_with_cache flag, calculate costs
  as if we used join cache (because we will be able to do so)

3338. By Alexey Botchkov on 2011-12-08

bug #901655 ST_BUFFER asserts with a coplicated shape.
        Coinciding nodes can appear as a result of DOUBLE inaccuracy.
        We should test that before we start the loop.

        Also the spatial relations can be calculated faster if we check
        MBR relations first. And we do have the shape's MBR-s now.

per-file comments:
  sql/gcalc_slicescan.cc
        set_extent() method added.
bug #901655 ST_BUFFER asserts with a coplicated shape.
  sql/gcalc_slicescan.h
        set_extent() method declared.
bug #901655 ST_BUFFER asserts with a coplicated shape.
  sql/gcalc_tools.cc
bug #901655 ST_BUFFER asserts with a coplicated shape.
        checks for equal nodes added.
  sql/item_geofunc.cc
bug #901655 ST_BUFFER asserts with a coplicated shape.
        MBR for the shapes calculated, and MBR checks added before we
        start the heavy calculations.
  sql/spatial.h
bug #901655 ST_BUFFER asserts with a coplicated shape.
        MBR::buffer() method implemented.

3339. By Igor Babaev on 2011-12-09

Fixed LP bug #901312.
The function setup_sj_materialization_part1() forgot to set the value
of TABLE::map for any materialized IN subquery.
This could lead to wrong results for queries with subqueries that were
converted to queries with semijoins.

3340. By Michael Widenius on 2011-12-11

Merge with 5.1 & fixes to IGNORE handling

3341. By Igor Babaev on 2011-12-11

Adjusted the results of pbxt.subselect after the latest merge 5.1->5.2->5.3.

3342. By Igor Babaev on 2011-12-11

Merge

3343. By Igor Babaev on 2011-12-12

Fixed LP bug #901709.
The cause of the reported assertion failure was a division of a double value by 0.

3344. By Sergei Golubchik on 2011-12-12

5.2->5.3 merge

3345. By Michael Widenius on 2011-12-13

Automatic merge

3346. By Oleksandr "Sanja" Byelkin on 2011-12-13

The variable query_cache_strip_comments allowed in embedded server.

3347. By Sergey Petrunia on 2011-12-13

BUG#902632: Crash or invalid read at st_join_table::cleanup, st_table::disable_keyread
- Do a "more thorough" cleanup of SJ-Materialization join tab in JOIN_TAB::cleanup. The bug
  was due to the fact that JOIN_TAB::cleanup() may be called multiple times for the same tab
  if the join has grouping.

3348. By Igor Babaev on 2011-12-13

Merge

3349. By Sergey Petrunia on 2011-12-14

Merge

3350. By Michael Widenius on 2011-12-14

Merge

3351. By Sergey Petrunia on 2011-12-15

Fix trivial merge error

3352. By Sergey Petrunia on 2011-12-15

Merge

3353. By Sergey Petrunia on 2011-12-15

Fix unused variable 'thd' error.

3354. By Sergey Petrunia on 2011-12-15

Merge

3355. By Igor Babaev on 2011-12-15

Merge

3356. By Alexey Botchkov on 2011-12-16

GIS issues fixed.

Failures on SUN Solaris. Buggy compiler there required some extra initialization
for variables. Then the 02 optimization leads to bugs when values set through the
pointer are not always taken into account. Finally, the (long long) / (long)
crashes there, the explicit typeconverstion added.
Failing innodb_plunin.innodb_gis.test fixed.

per-file comments:
  mysql-test/suite/innodb_plugin/t/innodb_gis.test
GIS issues fixed.
  sql/gcalc_slicescan.cc
GIS issues fixed.
  sql/gcalc_tools.cc
GIS issues fixed.

3357. By Sergey Petrunia on 2011-12-16

Update test results for previous push

3358. By Igor Babaev on 2011-12-16

Adjusted test cases of the suite funcs_1.

3359. By Sergey Petrunia on 2011-12-18

Bump version number: now it's 5.3.3 (5.3.2 has been released some time ago)

3360. By Igor Babaev on 2011-12-19

Fixed LP bug #904832.
Do not perform index condition pushdown for conditions containing subqueries
and stored functions.

3361. By Oleksandr "Sanja" Byelkin on 2011-12-19

Supression condition made wider to cover some other system cases.

3362. By Sergey Petrunia on 2011-12-19

Remove garbage comments

3363. By Sergey Petrunia on 2011-12-19

BUG#904432: Wrong result with LEFT JOIN, constant table, semijoin=ON,materialization=ON
- Correct handling for SJ-Materialization + outer joins (details in the comments in the code)

3364. By Sergey Petrunia on 2011-12-19

BUG#906385: EXPLAIN EXTENDED crashes in TABLE_LIST::print with limited max_join_size
- Take into account that subquery's optimization can fail because of @@max_join_size error.

3365. By Timour Katchaounov on 2011-12-19

Backport of WL#5953 from MySQL 5.6

The patch differs from the original MySQL patch as follows:
- All test case differences have been reviewed one by one, and
  care has been taken to restore the original plan so that each
  test case executes the code path it was designed for.
- A bug was found and fixed in MariaDB 5.3 in
  Item_allany_subselect::cleanup().
- ORDER BY is not removed because we are unsure of all effects,
  and it would prevent enabling ORDER BY ... LIMIT subqueries.
- ref_pointer_array.m_size is not adjusted because we don't do
  array bounds checking, and because it looks risky.

Original comment by Jorgen Loland:
-------------------------------------------------------------
WL#5953 - Optimize away useless subquery clauses

For IN/ALL/ANY/SOME/EXISTS subqueries, the following clauses are
meaningless:

* ORDER BY (since we don't support LIMIT in these subqueries)
* DISTINCT
* GROUP BY if there is no HAVING clause and no aggregate
  functions

This WL detects and optimizes away these useless parts of the
query during JOIN::prepare()

3366. By Sergey Petrunia on 2011-12-20

Update mysql-test/suite/pbxt/r/subselect.result for the previous push

3367. By Sergey Petrunia on 2011-12-20

Fix version number: it's 5.3.3

3368. By Igor Babaev on 2011-12-24

Back-ported the patch of the mysql-5.6 code line that

fixed several defects in the greedy optimization:

1) The greedy optimizer calculated the 'compare-cost' (CPU-cost)
   for iterating over the partial plan result at each level in
   the query plan as 'record_count / (double) TIME_FOR_COMPARE'

   This cost was only used locally for 'best' calculation at each
   level, and *not* accumulated into the total cost for the query plan.

   This fix added the 'CPU-cost' of processing 'current_record_count'
   records at each level to 'current_read_time' *before* it is used as
   'accumulated cost' argument to recursive
   best_extension_by_limited_search() calls. This ensured that the
   cost of a huge join-fanout early in the QEP was correctly
   reflected in the cost of the final QEP.

   To get identical cost for a 'best' optimized query and a
   straight_join with the same join order, the same change was also
   applied to optimize_straight_join() and get_partial_join_cost()

2) Furthermore to get equal cost for 'best' optimized query and a
   straight_join the new code substrcated the same '0.001' in
   optimize_straight_join() as it had been already done in
   best_extension_by_limited_search()

3) When best_extension_by_limited_search() aggregated the 'best' plan a
   plan was 'best' by the check :

   'if ((search_depth == 1) || (current_read_time < join->best_read))'

   The term '(search_depth == 1' incorrectly caused a new best plan to be
   collected whenever the specified 'search_depth' was reached - even if
   this partial query plan was more expensive than what we had already
   found.

3369. By Igor Babaev on 2011-12-26

Changed a test case from join_cache.test to make it platform independent.

3370. By Michael Widenius on 2011-12-28

Merge with groonga storage engine

3371. By Kazuhiko on 2011-12-29

sync with groonga-1.2.9.

3372. By Kazuhiko on 2011-12-29

sync with mroonga-1.11.

3373. By Kazuhiko on 2011-12-29

change storage engine name to "mroonga" from "groonga".

3374. By Kazuhiko on 2011-12-29

fix plugin declaration.

3375. By Kazuhiko on 2011-12-29

build mroonga with the old library name too for backward compatibility.

3376. By Kazuhiko on 2011-12-29

build mroonga with the old library name too for backward compatibility.

3377. By Kazuhiko on 2011-12-29

mroonga's versino string should be still 1.11.

3378. By Kazuhiko on 2011-12-30

sync with mroonga 737b00803a.

3379. By Kazuhiko on 2011-12-30

remove a backward compatibility hack in configure.in.

3380. By Kazuhiko on 2012-01-06

sync with mroonga 4827b03b88.

3381. By Kazuhiko on 2012-01-09

merge with ~maria-captains/maria/mariadb-5.3-monty

3382. By Kazuhiko on 2012-01-10

sync with mroonga bae8e77d60.

3383. By Kazuhiko on 2012-01-10

move mroonga related include files from mysql-test/include to mysql-test/suite/mroonga_storage/inc.

3384. By Kazuhiko on 2012-01-11

move extra/groonga/ to storage/mroonga/groonga and sync with groonga d22672d69b.

3385. By Kazuhiko on 2012-01-11

sync with groonga 565ce7eb5e.

3386. By Kazuhiko on 2012-01-11

call autotools in storage/mroonga/groonga too.

3387. By Kazuhiko on 2012-01-11

add missing storage/mroonga/groonga/autogen.sh.

3388. By Kazuhiko on 2012-01-12

update groonga : 1.2.9-39-ged9e535.

3389. By Kazuhiko on 2012-01-12

update groonga : 1.2.9-43-g61bf230.

3390. By Kazuhiko on 2012-01-12

add mrn_version.h in noinst_HEADERS.

3391. By Kazuhiko on 2012-01-12

add suite/mroonga_storage/inc in TEST_DIRS.

3392. By Kazuhiko on 2012-01-12

update groonga : 1.2.9-46-g8f54dce.

3393. By Kazuhiko on 2012-01-12

update .bzrignore.

3394. By Kazuhiko on 2012-01-30

version up : groonga-1.3.0.

3395. By Kazuhiko on 2012-01-30

version up : mroonga-1.2.0.

3396. By Kazuhiko on 2012-01-30

these test no longer exist in mroonga-1.2.0.

3397. By Kazuhiko on 2012-01-30

follow MariaDB API.

3398. By Kazuhiko on 2012-01-30

add more tests for mroonga.

3399. By Kazuhiko on 2012-01-31

sync storage/mroonga with aaf4939e10.

3400. By Kazuhiko on 2012-02-21

sync storage/mroonga with 3bd1c26d84.

3401. By Kazuhiko on 2012-02-22

sync storage/mroonga/groonga with ccd492be04.

3402. By Kazuhiko on 2012-02-22

sync storage/mroonga with 8ff00828cc.

3403. By Kazuhiko on 2012-02-22

sync storage/mroonga with 25d8868156.

3404. By Kazuhiko on 2012-02-23

sync with ~maria-captains/maria/5.3 revision 3439.

3405. By Kazuhiko on 2012-02-24

sync storage/mroonga/groonga with 77f2afc794.

3406. By Kazuhiko on 2012-02-24

sync storage/mroonga with d043994701 except a85e22e357.

3407. By Kazuhiko on 2012-02-24

sync storage/mroonga with ff6533b8cf.

3408. By Kazuhiko on 2012-02-24

update .bzrignore

3409. By Kazuhiko on 2012-02-26

sync storage/mroonga with b1c398da0b.

3410. By Kazuhiko on 2012-02-27

sync storage/mroonga/groonga with c624c5d218.

3411. By Kazuhiko on 2012-02-27

update storage/mroogna/groonga/doc.

3412. By Kazuhiko on 2012-02-28

sync storage/mroonga/groonga with version 2.0.0.

3413. By Kazuhiko on 2012-02-28

sync storage/mroonga with version 2.0.0.

3414. By Kazuhiko on 2012-02-28

sync with ~maria-captains/maria/5.3 revision 3448.

3415. By Kazuhiko on 2012-02-28

modify the expected test result for plugin_version.

3416. By Kazuhiko on 2012-02-28

disable mroonga on Windows for now.

3417. By Kazuhiko on 2012-02-29

these tests don't run on embedded server.

3418. By Kazuhiko on 2012-02-29

readd this file that is removed by mistake.

3419. By Kazuhiko on 2012-03-01

remove --enable-document check on make dist.

3420. By Kazuhiko on 2012-03-01

sync storage/mroonga with c1473da4c7.

3421. By Kazuhiko on 2012-03-01

make pbxt.mysqlshow result stable, so that the combination of enabled engines does not affect its result.

3422. By Kazuhiko on 2012-03-02

make funcs_1.is_columns_is and funcs_1.is_tables_is stable, even if mroonga is enabled.

3423. By Kazuhiko on 2012-03-02

don't remove generated documents without hg.

3424. By Kazuhiko on 2012-03-02

BUILD/autorun.sh invokes autotools on storage/mroonga/groonga too to avoid problems caused by version mismatch.

3425. By Kazuhiko on 2012-03-02

these files should be now automatically generated.

3426. By Kazuhiko on 2012-03-02

update timestamps for documents.

3427. By Kazuhiko on 2012-03-02

update .bzrignore.

3428. By Kazuhiko on 2012-03-05

remove automatically generated files.

3429. By Kazuhiko on 2012-03-05

sync storage/mroonga/groonga with c0e556a7a1.

3430. By Kazuhiko on 2012-03-05

sync storage/mroonga with 5f0755b034.

3431. By Kazuhiko on 2012-03-05

sync storage/mroonga/groonga with 4ff4e9de80.

3432. By Kazuhiko on 2012-03-05

remove all automatically generated files.

3433. By Kazuhiko on 2012-03-05

forgot to add this directory.

3434. By Kazuhiko on 2012-03-05

removed by mistake.

3435. By Kazuhiko on 2012-03-05

forgot to add this file.

3436. By Kazuhiko on 2012-03-06

sync storage/mroonga/groonga with 152449f75d.

3437. By Kazuhiko on 2012-03-06

build mroonga as plugin only.

3438. By Kazuhiko on 2012-03-06

add missing files.

3439. By Kazuhiko on 2012-03-06

sync with 5.3-monty

3440. By Kazuhiko on 2012-03-07

sync with ~maria-captains/maria/5.3 revision 3455.

3441. By Kazuhiko on 2012-03-07

sync storage/mroonga with 787041ee01.

3442. By Kazuhiko on 2012-03-09

update storage/mroonga and storage/mroonga/groonga.

3443. By Kazuhiko on 2012-03-10

remove have_innodb.inc because xtradb plugin is already loaded by have_mroonga.opt.

3444. By Kazuhiko on 2012-03-10

remove a hack that does not work anyway.

3445. By Kazuhiko on 2012-03-12

32bit: use longlong for last_insert_grn_id().

3446. By Kazuhiko on 2012-03-12

update storage/mroonga/groonga to fix valgrind warning.

3447. By Kazuhiko on 2012-03-12

support datetime with fractional seconds as primary key.

3448. By Kazuhiko on 2012-03-13

merge storage/mroonga/groonga/autogen.sh into BUILD/autorun.sh because storage/mroonga/groonga/autogen.sh is not included in 'make dist' result.

3449. By Kazuhiko on 2012-03-13

forgot to add.

3450. By Kazuhiko on 2012-03-13

storage/mroonga/groonga/version.sh should be now included in the repository.

3451. By Kazuhiko on 2012-03-18

remove renamed files.

3452. By Kazuhiko on 2012-03-18

update storage/mroonga.

3453. By Kazuhiko on 2012-03-19

update storage/mroonga to fix compilation problem on solaris.

3454. By Kazuhiko on 2012-03-22

update storage/mroonga/groonga.

3455. By Kazuhiko on 2012-03-22

update storage/mroonga.

3456. By Kazuhiko on 2012-03-22

fix a typo in configure argument to specify the default parser for mroonga.

3457. By Kazuhiko on 2012-03-22

some modifications because of the new sub directory storage/mroonga/lib.

3458. By Kazuhiko on 2012-03-26

update storage/mroonga and storage/mroonga/groonga.

3459. By Kazuhiko on 2012-03-27

update storage/mroonga.

3460. By Kazuhiko on 2012-03-28

add more tests.

3461. By Kazuhiko on 2012-03-28

update storage/mroonga/groonga.

3462. By Kazuhiko on 2012-03-28

remove renamed tests.

3463. By Kazuhiko on 2012-04-23

update mroonga and groonga.

3464. By Kazuhiko on 2012-04-23

remove auto-generated files.

3465. By Kazuhiko on 2012-04-23

update .bzrignore.

3466. By Kazuhiko on 2012-04-26

update mroonga and groonga.

3467. By Kazuhiko on 2012-04-26

remove an obsolete file.

3468. By Kazuhiko on 2012-04-26

sync with ~maria-captains/maria/5.3 revision 3507.

3469. By Kazuhiko on 2012-04-26

support MariaDB 5.3.6 whose auto_repair requires an argument.

3470. By Kazuhiko on 2012-04-26

add gpg_uid that is required for autoconf in storage/mroonga/groonga.

3471. By Kazuhiko on 2012-04-27

add missing files.

3472. By Kazuhiko on 2012-04-27

update storage/mroonga.

3473. By Kazuhiko on 2012-04-27

update storage/mroonga/groonga.

Unmerged revisions

3473. By Kazuhiko on 2012-04-27

update storage/mroonga/groonga.

3472. By Kazuhiko on 2012-04-27

update storage/mroonga.

3471. By Kazuhiko on 2012-04-27

add missing files.

3470. By Kazuhiko on 2012-04-26

add gpg_uid that is required for autoconf in storage/mroonga/groonga.

3469. By Kazuhiko on 2012-04-26

support MariaDB 5.3.6 whose auto_repair requires an argument.

3468. By Kazuhiko on 2012-04-26

sync with ~maria-captains/maria/5.3 revision 3507.

3467. By Kazuhiko on 2012-04-26

remove an obsolete file.

3466. By Kazuhiko on 2012-04-26

update mroonga and groonga.

3465. By Kazuhiko on 2012-04-23

update .bzrignore.

3464. By Kazuhiko on 2012-04-23

remove auto-generated files.

=== modified file '.bzrignore'
--- .bzrignore	2012-02-20 23:58:50 +0000
+++ .bzrignore	2012-04-27 12:15:31 +0000
@@ -1982,3 +1982,19 @@
 plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL
 libmysqld/gcalc_slicescan.cc
 libmysqld/gcalc_tools.cc
+storage/mroonga/groonga/config.lt
+storage/mroonga/groonga/examples/kv
+storage/mroonga/groonga/groonga.pc
+storage/mroonga/groonga/libtool.m4
+storage/mroonga/groonga/ltoptions.m4
+storage/mroonga/groonga/ltsugar.m4
+storage/mroonga/groonga/ltversion.m4
+storage/mroonga/groonga/lt~obsolete.m4
+storage/mroonga/groonga/packages/windows/setup-x64.nsi
+storage/mroonga/groonga/src/grnslap
+storage/mroonga/groonga/src/groonga
+storage/mroonga/groonga/src/groonga-benchmark
+storage/mroonga/groonga/src/suggest/groonga-suggest-create-dataset
+storage/mroonga/groonga/test/benchmark/bench-geo-distance
+storage/mroonga/groonga/test/benchmark/bench-geo-select
+storage/mroonga/groonga/test/benchmark/bench-table-factory
 
=== modified file 'BUILD/autorun.sh'
--- BUILD/autorun.sh	2011-02-20 16:51:43 +0000
+++ BUILD/autorun.sh	2012-04-27 12:15:31 +0000
@@ -29,3 +29,12 @@
 # and --force to overwrite them if they already exist
 automake --add-missing --force  --copy || die "Can't execute automake"
 autoconf || die "Can't execute autoconf"
+
+(
+  cd storage/mroonga/groonga &&
+  aclocal &&
+  autoheader &&
+  $LIBTOOLIZE --force --copy &&
+  automake --add-missing --copy &&
+  autoconf
+)
 
=== modified file 'BUILD/compile-pentium64'
--- BUILD/compile-pentium64	2011-02-20 16:51:43 +0000
+++ BUILD/compile-pentium64	2012-04-27 12:15:31 +0000
@@ -7,7 +7,7 @@
 # On CentOS/Fedora Core 10 amd64, there is system libz.so but not
 # libz.a, so need to use bundled zlib when building static
 # binary. Hence we use --with-zlib-dir=bundled
-extra_configs="$pentium_configs $static_link --with-zlib-dir=bundled"
+extra_configs="$pentium_configs --with-zlib-dir=bundled"
 CC="$CC --pipe"
 strip=yes
 
 
=== modified file 'config/ac-macros/plugins.m4'
--- config/ac-macros/plugins.m4	2010-11-19 21:33:47 +0000
+++ config/ac-macros/plugins.m4	2012-04-27 12:15:31 +0000
@@ -293,6 +293,23 @@
 ])
 
 dnl ---------------------------------------------------------------------------
+dnl Macro: MYSQL_PLUGIN_CONFIG_FILES
+dnl
+dnl SYNOPSIS
+dnl   MYSQL_PLUGIN_CONFIG_FILES([name],[PLUGIN_CONFIGURE_FILE_PATHS_FROM_TOP_DIRECTORY])
+dnl
+dnl DESCRIPTION
+dnl   Declares configuration files for AC_CONFIG_FILES explicitly.
+dnl   Normaly, this is not needed because configuration files are detected
+dnl   automatically.
+dnl
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([MYSQL_PLUGIN_CONFIG_FILES],[
+ MYSQL_REQUIRE_PLUGIN([$1])
+ m4_define([MYSQL_PLUGIN_CONFIG_FILES_]AS_TR_CPP([$1]), [$2])
+])
+
+dnl ---------------------------------------------------------------------------
 dnl Macro: MYSQL_CONFIGURE_PLUGINS
 dnl
 dnl SYNOPSIS
@@ -353,7 +370,8 @@
   [MYSQL_PLUGIN_MANDATORY_]AS_TR_CPP([$1]),
   [MYSQL_PLUGIN_DISABLED_]AS_TR_CPP([$1]),
   [MYSQL_PLUGIN_EMBEDDED_]AS_TR_CPP([$1]),
-  [MYSQL_PLUGIN_ACTIONS_]AS_TR_CPP([$1])
+  [MYSQL_PLUGIN_ACTIONS_]AS_TR_CPP([$1]),
+  [MYSQL_PLUGIN_CONFIG_FILES_]AS_TR_CPP([$1]),
  )
 ])
 
@@ -371,6 +389,7 @@
 dnl 10 - disabled flag
 dnl 11 - static target for libmysqld (if different from $7)
 dnl 12 - actions
+dnl 13 - config files
 AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
  m4_ifdef([$5],[
   AH_TEMPLATE($5, [Include ]$3[ into mysqld])
@@ -524,18 +543,21 @@
     fi
   fi
 
-  m4_ifdef([$6], [
-    if test -d "$srcdir/$6"; then
-      # Even if we don't build a plugin, we bundle its source into the dist
-      # file.  So its Makefile (and Makefiles for any subdirs) must be
-      # generated for 'make dist' to work.
-      m4_syscmd([test -f "]$6[/configure"])
-      ifelse(m4_sysval, 0,
-        [AC_CONFIG_SUBDIRS($6)],
-        [
-          # autoconf doesn't provide an automatic way to configure DIST_SUBDIRS of
-          # a subdir; for our purposes, it's enough to just check for existing
-          # Makefile.am files and add them in here
+  m4_ifdef([$13], [
+   AC_CONFIG_FILES($13)
+  ],[
+   m4_ifdef([$6], [
+     if test -d "$srcdir/$6"; then
+       # Even if we don't build a plugin, we bundle its source into the dist
+       # file.  So its Makefile (and Makefiles for any subdirs) must be
+       # generated for 'make dist' to work.
+       m4_syscmd([test -f "]$6[/configure"])
+       ifelse(m4_sysval, 0,
+	 [AC_CONFIG_SUBDIRS($6)],
+	 [
+	   # autoconf doesn't provide an automatic way to configure DIST_SUBDIRS of
+	   # a subdir; for our purposes, it's enough to just check for existing
+	   # Makefile.am files and add them in here
 dnl
 dnl Warning, don't try to quote the m4_esyscmd() macro, it doesn't
 dnl work.  Quoting here is tricky.
@@ -544,10 +566,15 @@
 dnl to if they need to pass a specific path.  This is *NOT* used when calling
 dnl running configure!
 dnl
-          AC_CONFIG_FILES(m4_esyscmd([${FIND-find} "]$6[" -name Makefile.am -print | ${SED-sed} 's,\.am$,,']))
-        ]
-      )
+           AC_CONFIG_FILES(m4_esyscmd([${FIND-find} "]$6[" -name Makefile.am -print | ${SED-sed} 's,\.am$,,']))
+         ]
+       )
+     fi
+   ])
+  ])
 
+  m4_ifdef([$6], [
+    if test -d "$srcdir/$6"; then
       ifelse(
         m4_substr($6, 0, 8), [storage/], [
           mysql_se_distdirs="$mysql_se_distdirs m4_substr($6, 8)"
 
=== modified file 'config/ac-macros/zlib.m4'
--- config/ac-macros/zlib.m4	2011-02-23 09:22:56 +0000
+++ config/ac-macros/zlib.m4	2012-04-27 12:15:31 +0000
@@ -79,8 +79,8 @@
     ;;
   *)
     AC_ARG_WITH([zlib-dir],
-                AC_HELP_STRING([--with-zlib-dir=no|bundled|DIR],
-                               [Provide MySQL with a custom location of
+                AC_HELP_STRING([--with-zlib-dir=no|bundled|system|DIR],
+                               [Provide MariaDB with a custom location of
                                compression library. Given DIR, zlib binary is 
                                assumed to be in $DIR/lib and header files
                                in $DIR/include.]),
@@ -95,7 +95,7 @@
         MYSQL_USE_BUNDLED_ZLIB
         AC_MSG_RESULT([using bundled zlib])
         ;;
-      "")
+      "" | "system")
         ZLIB_INCLUDES=""
         ZLIB_LIBS="-lz"
         MYSQL_CHECK_ZLIB_DIR
 
=== modified file 'mysql-test/Makefile.am'
--- mysql-test/Makefile.am	2012-02-21 15:58:43 +0000
+++ mysql-test/Makefile.am	2012-04-27 12:15:31 +0000
@@ -116,7 +116,12 @@
 	suite/engines/iuds/t suite/engines/rr_trx/include suite/engines/rr_trx/r \
 	suite/engines/rr_trx/t \
         suite/optimizer_unfixed_bugs/t \
-        suite/optimizer_unfixed_bugs/r
+        suite/optimizer_unfixed_bugs/r \
+        suite/mroonga_storage/inc \
+        suite/mroonga_storage/t \
+        suite/mroonga_storage/r \
+        suite/mroonga_wrapper/t \
+        suite/mroonga_wrapper/r
 
 # Used by dist-hook and install-data-local to copy all
 # test files into either dist or install directory
 
=== modified file 'mysql-test/mysql-test-run.pl'
--- mysql-test/mysql-test-run.pl	2012-04-05 21:07:18 +0000
+++ mysql-test/mysql-test-run.pl	2012-04-27 12:15:31 +0000
@@ -160,9 +160,10 @@
 # executables will be used by the test suite.
 our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
 
-my $DEFAULT_SUITES="main,binlog,federated,rpl,maria,handler,parts,innodb," . 
+my $DEFAULT_SUITES="main,binlog,federated,rpl,maria,handler,parts,innodb," .
                    "innodb_plugin,percona,ndb,vcol,oqgraph,sphinx," .
-                   "optimizer_unfixed_bugs,plugins";
+                   "optimizer_unfixed_bugs,plugins," .
+                   "mroonga_storage,mroonga_wrapper";
 my $opt_suites;
 
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
 
=== modified file 'mysql-test/r/log_state.result'
--- mysql-test/r/log_state.result	2011-05-19 17:19:44 +0000
+++ mysql-test/r/log_state.result	2012-04-27 12:15:31 +0000
@@ -271,10 +271,10 @@
 SET GLOBAL general_log_file = 'bug32748.query.log';
 SET GLOBAL slow_query_log_file = 'bug32748.slow.log';
 
-SHOW VARIABLES LIKE '%log_file';
-Variable_name	Value
-general_log_file	bug32748.query.log
-slow_query_log_file	bug32748.slow.log
+select * from information_schema.global_variables where variable_name like "%log_file" and (variable_name like "general%" or variable_name like "slow%");
+VARIABLE_NAME	VARIABLE_VALUE
+GENERAL_LOG_FILE	bug32748.query.log
+SLOW_QUERY_LOG_FILE	bug32748.slow.log
 
 SET GLOBAL general_log_file = @old_general_log_file;
 SET GLOBAL slow_query_log_file = @old_slow_query_log_file;
 
=== removed file 'mysql-test/suite/binlog/t/binlog_index-master.opt.moved'
--- mysql-test/suite/binlog/t/binlog_index-master.opt.moved	2011-02-20 16:51:43 +0000
+++ mysql-test/suite/binlog/t/binlog_index-master.opt.moved	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
---skip-stack-trace --test-expect-abort --log-warnings=0
 
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_is.result'
--- mysql-test/suite/funcs_1/r/is_columns_is.result	2011-07-01 12:08:30 +0000
+++ mysql-test/suite/funcs_1/r/is_columns_is.result	2012-04-27 12:15:31 +0000
@@ -1,6 +1,6 @@
 SELECT * FROM information_schema.columns
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling'
+AND table_name <> 'profiling' AND table_name <> 'mroonga_stats'
 ORDER BY table_schema, table_name, column_name;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	DATETIME_PRECISION	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT
 NULL	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	1		NO	varchar	32	96	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select	
@@ -502,7 +502,7 @@
 COLLATION_NAME
 FROM information_schema.columns
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling'
+AND table_name <> 'profiling' AND table_name <> 'mroonga_stats'
 AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH = 1
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
@@ -514,7 +514,7 @@
 COLLATION_NAME
 FROM information_schema.columns
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling'
+AND table_name <> 'profiling' AND table_name <> 'mroonga_stats'
 AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH <> 1
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
@@ -526,7 +526,7 @@
 COLLATION_NAME
 FROM information_schema.columns
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling'
+AND table_name <> 'profiling' AND table_name <> 'mroonga_stats'
 AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH IS NULL
 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
 COL_CML	DATA_TYPE	CHARACTER_SET_NAME	COLLATION_NAME
@@ -550,7 +550,7 @@
 COLUMN_TYPE
 FROM information_schema.columns
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling'
+AND table_name <> 'profiling' AND table_name <> 'mroonga_stats'
 ORDER BY TABLE_SCHEMA, TABLE_NAME, ORDINAL_POSITION;
 COL_CML	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE
 3.0000	information_schema	CHARACTER_SETS	CHARACTER_SET_NAME	varchar	32	96	utf8	utf8_general_ci	varchar(32)
 
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_is.result'
--- mysql-test/suite/funcs_1/r/is_tables_is.result	2010-09-11 18:43:48 +0000
+++ mysql-test/suite/funcs_1/r/is_tables_is.result	2012-04-27 12:15:31 +0000
@@ -11,7 +11,7 @@
 '-----------------------------------------------------' AS "Separator"
 FROM information_schema.tables
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling'
+AND table_name <> 'profiling' AND table_name <> 'mroonga_stats'
 ORDER BY table_schema,table_name;
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
@@ -1201,7 +1201,7 @@
 '-----------------------------------------------------' AS "Separator"
 FROM information_schema.tables
 WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling'
+AND table_name <> 'profiling' AND table_name <> 'mroonga_stats'
 ORDER BY table_schema,table_name;
 TABLE_CATALOG	NULL
 TABLE_SCHEMA	information_schema
 
=== modified file 'mysql-test/suite/funcs_1/t/is_columns_is.test'
--- mysql-test/suite/funcs_1/t/is_columns_is.test	2010-08-17 07:14:46 +0000
+++ mysql-test/suite/funcs_1/t/is_columns_is.test	2012-04-27 12:15:31 +0000
@@ -22,5 +22,5 @@
 --source include/have_xtradb.inc
 
 let $my_where = WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling';
+AND table_name <> 'profiling' AND table_name <> 'mroonga_stats';
 --source suite/funcs_1/datadict/columns.inc
 
=== modified file 'mysql-test/suite/funcs_1/t/is_tables_is.test'
--- mysql-test/suite/funcs_1/t/is_tables_is.test	2010-09-11 18:43:48 +0000
+++ mysql-test/suite/funcs_1/t/is_tables_is.test	2012-04-27 12:15:31 +0000
@@ -15,5 +15,5 @@
 --source include/not_embedded.inc
 --source include/have_innodb.inc
 let $my_where = WHERE table_schema = 'information_schema'
-AND table_name <> 'profiling';
+AND table_name <> 'profiling' AND table_name <> 'mroonga_stats';
 --source suite/funcs_1/datadict/tables1.inc
 
=== added directory 'mysql-test/suite/mroonga_storage'
=== added directory 'mysql-test/suite/mroonga_storage/inc'
=== added file 'mysql-test/suite/mroonga_storage/inc/have_fractional_seconds.inc'
--- mysql-test/suite/mroonga_storage/inc/have_fractional_seconds.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/inc/have_fractional_seconds.inc	2012-04-27 12:15:31 +0000
@@ -0,0 +1,34 @@
+# Copyright(C) 2012 Kouhei Sutou <[e-mail]>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+--source suite/mroonga_storage/inc/have_mariadb.inc
+
+if ($have_mariadb)
+{
+  let $fractional_seconds = 1;
+}
+
+if (!$have_mariadb)
+{
+--disable_query_log
+  let $fractional_seconds = `SELECT @@global.version >= '5.6'`;
+--enable_query_log
+}
+
+if (!$fractional_seconds)
+{
+  skip fractional seconds in time values are available in MySQL version 5.6 or later or MariaDB;
+}
 
=== added file 'mysql-test/suite/mroonga_storage/inc/have_fulltext_index_comment.inc'
--- mysql-test/suite/mroonga_storage/inc/have_fulltext_index_comment.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/inc/have_fulltext_index_comment.inc	2012-04-27 12:15:31 +0000
@@ -0,0 +1,7 @@
+--disable_query_log
+let $fulltext_index_comment = `SELECT @@global.version >= '5.5'`;
+--enable_query_log
+if (!$fulltext_index_comment)
+{
+  skip Fulltext index comment is available in version 5.5 or later;
+}
 
=== added file 'mysql-test/suite/mroonga_storage/inc/have_mariadb.inc'
--- mysql-test/suite/mroonga_storage/inc/have_mariadb.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/inc/have_mariadb.inc	2012-04-27 12:15:31 +0000
@@ -0,0 +1,19 @@
+# Copyright(C) 2012 Kouhei Sutou <[e-mail]>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+--disable_query_log
+let $have_mariadb = `SELECT LOCATE('MariaDB', @@global.version) > 0`;
+--enable_query_log
 
=== added file 'mysql-test/suite/mroonga_storage/inc/have_mroonga.inc'
--- mysql-test/suite/mroonga_storage/inc/have_mroonga.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/inc/have_mroonga.inc	2012-04-27 12:15:31 +0000
@@ -0,0 +1,47 @@
+# Copyright(C) 2010 Kentoku SHIBA
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+disable_query_log;
+
+if (!`SELECT count(*) FROM information_schema.plugins WHERE
+      plugin_name = 'mroonga' AND plugin_status = 'active'`){
+  skip Need mroonga storage engine;
+}
+
+if (!`SELECT count(*) FROM information_schema.plugins WHERE
+      plugin_name = 'InnoDB' AND plugin_status = 'active'`){
+  skip Need InnoDB storage engine;
+}
+
+let have_default_storage_engine_variable=`SELECT 1 FROM information_schema.global_variables WHERE variable_name = "default_storage_engine"`;
+if ($have_default_storage_engine_variable)
+{
+  set default_storage_engine=mroonga;
+}
+if (!$have_default_storage_engine_variable)
+{
+  set storage_engine=mroonga;
+}
+set global mroonga_log_level=NOTICE;
+set global mroonga_default_parser=TokenBigram;
+
+let have_default_tmp_storage_engine_variable=`SELECT 1 FROM information_schema.global_variables WHERE variable_name = "default_tmp_storage_engine"`;
+if ($have_default_tmp_storage_engine_variable)
+{
+  set default_tmp_storage_engine=mroonga;
+}
+
+enable_query_log;
 
=== added file 'mysql-test/suite/mroonga_storage/inc/have_mroonga.opt'
--- mysql-test/suite/mroonga_storage/inc/have_mroonga.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/inc/have_mroonga.opt	2012-04-27 12:15:31 +0000
@@ -0,0 +1,3 @@
+--loose-mroonga
+--loose-innodb
+--plugin-load=$HA_XTRADB_SO;$HA_MROONGA_SO
 
=== added file 'mysql-test/suite/mroonga_storage/inc/have_mroonga_deinit.inc'
--- mysql-test/suite/mroonga_storage/inc/have_mroonga_deinit.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/inc/have_mroonga_deinit.inc	2012-04-27 12:15:31 +0000
@@ -0,0 +1,35 @@
+# Copyright(C) 2010 Kentoku SHIBA
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+disable_query_log;
+
+set global mroonga_default_parser=TokenBigram;
+set global mroonga_log_level=NOTICE;
+if ($have_default_storage_engine_variable)
+{
+  set default_storage_engine=MyISAM;
+}
+if (!$have_default_storage_engine_variable)
+{
+  set storage_engine=MyISAM;
+}
+
+if ($have_default_tmp_storage_engine_variable)
+{
+  set default_tmp_storage_engine=MyISAM;
+}
+
+enable_query_log;
 
=== added file 'mysql-test/suite/mroonga_storage/inc/have_mroonga_helper.inc'
--- mysql-test/suite/mroonga_storage/inc/have_mroonga_helper.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/inc/have_mroonga_helper.inc	2012-04-27 12:15:31 +0000
@@ -0,0 +1,17 @@
+# Copyright(C) 2011 Kouhei Sutou <[e-mail]>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+let $MYSQLD_DATADIR= `select @@datadir`;
 
=== added file 'mysql-test/suite/mroonga_storage/inc/have_mroonga_plugin.inc'
--- mysql-test/suite/mroonga_storage/inc/have_mroonga_plugin.inc	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/inc/have_mroonga_plugin.inc	2012-04-27 12:15:31 +0000
@@ -0,0 +1,6 @@
+--source suite/mroonga_storage/inc/have_mroonga.inc
+
+if (!`SELECT COUNT(*) FROM INFORMATION_SCHEMA.PLUGINS
+         WHERE PLUGIN_NAME = 'mroonga' AND PLUGIN_LIBRARY='ha_mroonga.so'`) {
+  skip Need mroonga plugin as shared library;
+}
 
=== added directory 'mysql-test/suite/mroonga_storage/r'
=== added file 'mysql-test/suite/mroonga_storage/r/alter_table_add_column.result'
--- mysql-test/suite/mroonga_storage/r/alter_table_add_column.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/alter_table_add_column.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,37 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  PRIMARY KEY (`id`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title) VALUES ("survey");
+SELECT * FROM diaries;
+id	title
+1	survey
+ALTER TABLE diaries ADD COLUMN body TEXT;
+UPDATE diaries SET body = "will start groonga!";
+SELECT * FROM diaries;
+id	title	body
+1	survey	will start groonga!
+INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga...");
+INSERT INTO diaries (title, body) values ("groonga (2)", "started groonga.");
+SELECT * FROM diaries;
+id	title	body
+1	survey	will start groonga!
+2	groonga (1)	starting groonga...
+3	groonga (2)	started groonga.
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `body` text,
+  PRIMARY KEY (`id`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/alter_table_change_engine.result'
--- mysql-test/suite/mroonga_storage/r/alter_table_change_engine.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/alter_table_change_engine.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,49 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+body TEXT,
+FULLTEXT INDEX title_index (title),
+FULLTEXT INDEX body_index (body)
+) ENGINE MyISAM DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `body` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title_index` (`title`),
+  FULLTEXT KEY `body_index` (`body`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, body) VALUES ("survey", "will start groonga!");
+INSERT INTO diaries (title, body) VALUES ("groonga (1)", "starting groonga...");
+SELECT * FROM diaries
+WHERE MATCH(title) AGAINST("survey" IN BOOLEAN MODE) AND
+MATCH(body) AGAINST("groonga" IN BOOLEAN MODE);
+id	title	body
+1	survey	will start groonga!
+ALTER TABLE diaries ENGINE = mroonga;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `body` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title_index` (`title`),
+  FULLTEXT KEY `body_index` (`body`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+SELECT * FROM diaries
+WHERE MATCH(title) AGAINST("survey" IN BOOLEAN MODE) AND
+MATCH(body) AGAINST("groonga" IN BOOLEAN MODE);
+id	title	body
+1	survey	will start groonga!
+INSERT INTO diaries (title, body) VALUES ("groonga (2)", "started groonga.");
+SELECT * FROM diaries
+WHERE MATCH(title) AGAINST("groonga" IN BOOLEAN MODE) AND
+MATCH(body) AGAINST("groonga" IN BOOLEAN MODE);
+id	title	body
+2	groonga (1)	starting groonga...
+3	groonga (2)	started groonga.
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/alter_table_drop_column.result'
--- mysql-test/suite/mroonga_storage/r/alter_table_drop_column.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/alter_table_drop_column.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,37 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+body TEXT
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `body` text,
+  PRIMARY KEY (`id`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, body) VALUES ("survey", "will start groonga!");
+SELECT * FROM diaries;
+id	title	body
+1	survey	will start groonga!
+ALTER TABLE diaries DROP COLUMN body;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  PRIMARY KEY (`id`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+SELECT * FROM diaries;
+id	title
+1	survey
+INSERT INTO diaries (title) values ("groonga (1)");
+INSERT INTO diaries (title) values ("groonga (2)");
+SELECT * FROM diaries;
+id	title
+1	survey
+2	groonga (1)
+3	groonga (2)
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/alter_table_engine_decimal.result'
--- mysql-test/suite/mroonga_storage/r/alter_table_engine_decimal.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/alter_table_engine_decimal.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,38 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+temperature DECIMAL(6, 3)
+) ENGINE InnoDB DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `temperature` decimal(6,3) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, temperature) VALUES ("clear day", 21.281);
+SELECT * FROM diaries;
+id	title	temperature
+1	clear day	21.281
+ALTER TABLE diaries ENGINE = mroonga;
+SELECT * FROM diaries;
+id	title	temperature
+1	clear day	21.281
+INSERT INTO diaries (title, temperature) VALUES ("rainy day", 14.213);
+INSERT INTO diaries (title, temperature) VALUES ("cloudy day", 17.821);
+SELECT * FROM diaries;
+id	title	temperature
+1	clear day	21.281
+2	rainy day	14.213
+3	cloudy day	17.821
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `temperature` decimal(6,3) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/alter_table_fulltext.result'
--- mysql-test/suite/mroonga_storage/r/alter_table_fulltext.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/alter_table_fulltext.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,52 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+FULLTEXT INDEX title_index (title)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title_index` (`title`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title) VALUES ("survey");
+SELECT * FROM diaries;
+id	title
+1	survey
+ALTER TABLE diaries ADD COLUMN body TEXT;
+UPDATE diaries SET body = "will start groonga!";
+SELECT * FROM diaries;
+id	title	body
+1	survey	will start groonga!
+INSERT INTO diaries (title, body) values ("groonga (1)", "starting groonga...");
+INSERT INTO diaries (title, body) values ("groonga (2)", "started groonga.");
+SELECT * FROM diaries;
+id	title	body
+1	survey	will start groonga!
+2	groonga (1)	starting groonga...
+3	groonga (2)	started groonga.
+ALTER TABLE diaries ADD FULLTEXT INDEX body_index (body);
+SELECT * FROM diaries
+WHERE MATCH(title) AGAINST("survey") AND
+MATCH(body) AGAINST("groonga");
+id	title	body
+1	survey	will start groonga!
+SELECT * FROM diaries
+WHERE MATCH(title) AGAINST("groonga") AND
+MATCH(body) AGAINST("starting");
+id	title	body
+2	groonga (1)	starting groonga...
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `body` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title_index` (`title`),
+  FULLTEXT KEY `body_index` (`body`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/alter_table_rename_table.result'
--- mysql-test/suite/mroonga_storage/r/alter_table_rename_table.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/alter_table_rename_table.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,45 @@
+DROP TABLE IF EXISTS diaries, memos;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+body TEXT,
+FULLTEXT INDEX title_index (title),
+FULLTEXT INDEX body_index (body)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `body` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title_index` (`title`),
+  FULLTEXT KEY `body_index` (`body`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, body) VALUES ("survey", "will start groonga!");
+SELECT * FROM diaries;
+id	title	body
+1	survey	will start groonga!
+SELECT * FROM diaries
+WHERE MATCH(title) AGAINST("groonga") AND
+MATCH(body) AGAINST("starting");
+id	title	body
+ALTER TABLE diaries RENAME memos;
+SELECT * FROM memos;
+id	title	body
+1	survey	will start groonga!
+SELECT * FROM memos
+WHERE MATCH(title) AGAINST("groonga") AND
+MATCH(body) AGAINST("starting");
+id	title	body
+SHOW CREATE TABLE memos;
+Table	Create Table
+memos	CREATE TABLE `memos` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `body` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title_index` (`title`),
+  FULLTEXT KEY `body_index` (`body`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+DROP TABLE memos;
 
=== added file 'mysql-test/suite/mroonga_storage/r/alter_table_spatial.result'
--- mysql-test/suite/mroonga_storage/r/alter_table_spatial.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/alter_table_spatial.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,131 @@
+DROP TABLE IF EXISTS shops;
+CREATE TABLE shops (
+id INT PRIMARY KEY AUTO_INCREMENT,
+name TEXT,
+location GEOMETRY NOT NULL
+);
+INSERT INTO shops (name, location)
+VALUES ('nezu-no-taiyaki',
+GeomFromText('POINT(139.762573 35.720253)'));
+INSERT INTO shops (name, location)
+VALUES ('taiyaki-kataoka',
+GeomFromText('POINT(139.715591 35.712521)'));
+INSERT INTO shops (name, location)
+VALUES ('soba-taiyaki-ku',
+GeomFromText('POINT(139.659088 35.683712)'));
+INSERT INTO shops (name, location)
+VALUES ('kuruma',
+GeomFromText('POINT(139.706207 35.721516)'));
+INSERT INTO shops (name, location)
+VALUES ('hirose-ya',
+GeomFromText('POINT(139.685608 35.714844)'));
+INSERT INTO shops (name, location)
+VALUES ('sazare',
+GeomFromText('POINT(139.685043 35.714653)'));
+INSERT INTO shops (name, location)
+VALUES ('omede-taiyaki',
+GeomFromText('POINT(139.817154 35.700516)'));
+INSERT INTO shops (name, location)
+VALUES ('onaga-ya',
+GeomFromText('POINT(139.81105 35.698254)'));
+INSERT INTO shops (name, location)
+VALUES ('shiro-ya',
+GeomFromText('POINT(139.638611 35.705517)'));
+INSERT INTO shops (name, location)
+VALUES ('fuji-ya',
+GeomFromText('POINT(139.637115 35.703938)'));
+INSERT INTO shops (name, location)
+VALUES ('miyoshi',
+GeomFromText('POINT(139.537323 35.644539)'));
+INSERT INTO shops (name, location)
+VALUES ('juju-ya',
+GeomFromText('POINT(139.695755 35.628922)'));
+INSERT INTO shops (name, location)
+VALUES ('tatsumi-ya',
+GeomFromText('POINT(139.638657 35.665501)'));
+INSERT INTO shops (name, location)
+VALUES ('tetsuji',
+GeomFromText('POINT(139.76857 35.680912)'));
+INSERT INTO shops (name, location)
+VALUES ('gazuma-ya',
+GeomFromText('POINT(139.647598 35.700817)'));
+INSERT INTO shops (name, location)
+VALUES ('honma-mon',
+GeomFromText('POINT(139.652573 35.722736)'));
+INSERT INTO shops (name, location)
+VALUES ('naniwa-ya',
+GeomFromText('POINT(139.796234 35.730061)'));
+INSERT INTO shops (name, location)
+VALUES ('kuro-dai',
+GeomFromText('POINT(139.704834 35.650345)'));
+INSERT INTO shops (name, location)
+VALUES ('daruma',
+GeomFromText('POINT(139.770599 35.681461)'));
+INSERT INTO shops (name, location)
+VALUES ('yanagi-ya',
+GeomFromText('POINT(139.783981 35.685341)'));
+INSERT INTO shops (name, location)
+VALUES ('sharaku',
+GeomFromText('POINT(139.794846 35.716969)'));
+INSERT INTO shops (name, location)
+VALUES ('takane',
+GeomFromText('POINT(139.560913 35.698601)'));
+INSERT INTO shops (name, location)
+VALUES ('chiyoda',
+GeomFromText('POINT(139.652817 35.642601)'));
+INSERT INTO shops (name, location)
+VALUES ('da-ka-po',
+GeomFromText('POINT(139.727356 35.627346)'));
+INSERT INTO shops (name, location)
+VALUES ('matsushima-ya',
+GeomFromText('POINT(139.737381 35.640556)'));
+INSERT INTO shops (name, location)
+VALUES ('kazuya',
+GeomFromText('POINT(139.760895 35.673508)'));
+INSERT INTO shops (name, location)
+VALUES ('furuya-kogane-an',
+GeomFromText('POINT(139.676071 35.680603)'));
+INSERT INTO shops (name, location)
+VALUES ('hachi-no-ie',
+GeomFromText('POINT(139.668106 35.608021)'));
+INSERT INTO shops (name, location)
+VALUES ('azuki-chan',
+GeomFromText('POINT(139.673203 35.64151)'));
+INSERT INTO shops (name, location)
+VALUES ('kuriko-an',
+GeomFromText('POINT(139.796829 35.712013)'));
+INSERT INTO shops (name, location)
+VALUES ('yume-no-aru-machi-no-taiyaki-ya-san',
+GeomFromText('POINT(139.712524 35.616199)'));
+INSERT INTO shops (name, location)
+VALUES ('naze-ya',
+GeomFromText('POINT(139.665833 35.609039)'));
+INSERT INTO shops (name, location)
+VALUES ('sanoki-ya',
+GeomFromText('POINT(139.770721 35.66592)'));
+INSERT INTO shops (name, location)
+VALUES ('shigeta',
+GeomFromText('POINT(139.780273 35.672626)'));
+INSERT INTO shops (name, location)
+VALUES ('nishimi-ya',
+GeomFromText('POINT(139.774628 35.671825)'));
+INSERT INTO shops (name, location)
+VALUES ('hiiragi',
+GeomFromText('POINT(139.711517 35.647701)'));
+ALTER TABLE shops ADD SPATIAL KEY location_index (location);
+SELECT id, name, AsText(location) AS location_text FROM shops
+WHERE MBRContains(GeomFromText('LineString(139.7727 35.6684, 139.7038 35.7121)'), location);
+id	name	location_text
+14	tetsuji	POINT(139.76857 35.6809119444444)
+19	daruma	POINT(139.770598888889 35.6814611111111)
+26	kazuya	POINT(139.760895 35.6735080555556)
+SHOW CREATE TABLE shops;
+Table	Create Table
+shops	CREATE TABLE `shops` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` text,
+  `location` geometry NOT NULL,
+  PRIMARY KEY (`id`),
+  SPATIAL KEY `location_index` (`location`)
+) ENGINE=mroonga DEFAULT CHARSET=latin1
+DROP TABLE shops;
 
=== added file 'mysql-test/suite/mroonga_storage/r/auto_increment.result'
--- mysql-test/suite/mroonga_storage/r/auto_increment.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/auto_increment.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,53 @@
+drop table if exists t1;
+create table t1 (c1 int auto_increment, primary key(c1));
+insert into t1 values(null);
+select c1 from t1 order by c1 desc limit 1;
+c1
+1
+insert into t1 values(null);
+select c1 from t1 order by c1 desc limit 1;
+c1
+2
+insert into t1 values(10);
+select c1 from t1 order by c1 desc limit 1;
+c1
+10
+insert into t1 values(null);
+select c1 from t1 order by c1 desc limit 1;
+c1
+11
+insert into t1 values(6);
+select c1 from t1 order by c1 desc limit 1;
+c1
+11
+insert into t1 values(null);
+select c1 from t1 order by c1 desc limit 1;
+c1
+12
+drop table t1;
+create table t1 (c1 int, c2 int auto_increment, primary key(c1), key idx1(c2));
+insert into t1 values(1, null);
+select * from t1 order by c2 desc limit 1;
+c1	c2
+1	1
+insert into t1 values(2, null);
+select * from t1 order by c2 desc limit 1;
+c1	c2
+2	2
+insert into t1 values(3, 10);
+select * from t1 order by c2 desc limit 1;
+c1	c2
+3	10
+insert into t1 values(4, null);
+select * from t1 order by c2 desc limit 1;
+c1	c2
+4	11
+insert into t1 values(5, 6);
+select * from t1 order by c2 desc limit 1;
+c1	c2
+4	11
+insert into t1 values(6, null);
+select * from t1 order by c2 desc limit 1;
+c1	c2
+6	12
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/auto_increment_text.result'
--- mysql-test/suite/mroonga_storage/r/auto_increment_text.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/auto_increment_text.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,15 @@
+drop table if exists diaries;
+create table diaries (
+id int primary key auto_increment,
+body text
+);
+insert into diaries (body) values ("started groonga (long text)");
+select * from diaries;
+id	body
+1	started groonga (long text)
+insert into diaries (body) values ("sleeping... (short text)");
+select * from diaries;
+id	body
+1	started groonga (long text)
+2	sleeping... (short text)
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/binlog.result'
--- mysql-test/suite/mroonga_storage/r/binlog.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/binlog.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,34 @@
+drop table if exists t1;
+show variables like 'log_bin';
+Variable_name	Value
+log_bin	ON
+set binlog_format="STATEMENT";
+create table t1 (c1 int primary key, c2 int) engine = mroonga;
+insert into t1 values(1,100);
+insert into t1 values(2,100);
+commit;
+select * from t1;
+c1	c2
+1	100
+2	100
+drop table t1;
+set binlog_format="ROW";
+create table t1 (c1 int primary key, c2 int) engine = mroonga;
+insert into t1 values(1,100);
+insert into t1 values(2,100);
+commit;
+select * from t1;
+c1	c2
+1	100
+2	100
+drop table t1;
+set binlog_format="MIXED";
+create table t1 (c1 int primary key, c2 int) engine = mroonga;
+insert into t1 values(1,100);
+insert into t1 values(2,100);
+commit;
+select * from t1;
+c1	c2
+1	100
+2	100
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/btree.result'
--- mysql-test/suite/mroonga_storage/r/btree.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/btree.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,25 @@
+drop table if exists t1, t2, t3;
+create table t1 (c1 int primary key, c2 int, index using btree (c2));
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) NOT NULL,
+  `c2` int(11) DEFAULT NULL,
+  PRIMARY KEY (`c1`),
+  KEY `c2` (`c2`) USING BTREE
+) ENGINE=mroonga DEFAULT CHARSET=latin1
+insert into t1 values (1, 100);
+insert into t1 values (2, 101);
+insert into t1 values (3, 102);
+select * from t1;
+c1	c2
+1	100
+2	101
+3	102
+flush tables;
+select * from t1;
+c1	c2
+1	100
+2	101
+3	102
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_date_with_index.result'
--- mysql-test/suite/mroonga_storage/r/column_date_with_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_date_with_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,29 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+created_at DATE,
+KEY (created_at)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `created_at` date DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `created_at` (`created_at`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, created_at) VALUES ("clear day", "2012-01-29");
+INSERT INTO diaries (title, created_at) VALUES ("rainy day", "2012-01-30");
+INSERT INTO diaries (title, created_at) VALUES ("cloudy day", "2012-01-31");
+SELECT * FROM diaries;
+id	title	created_at
+1	clear day	2012-01-29
+2	rainy day	2012-01-30
+3	cloudy day	2012-01-31
+SELECT * FROM diaries WHERE created_at BETWEEN "2012-01-29" AND "2012-01-30";
+id	title	created_at
+1	clear day	2012-01-29
+2	rainy day	2012-01-30
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_date_without_index.result'
--- mysql-test/suite/mroonga_storage/r/column_date_without_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_date_without_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,27 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+created_at DATE
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `created_at` date DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, created_at) VALUES ("clear day", "2012-01-29");
+INSERT INTO diaries (title, created_at) VALUES ("rainy day", "2012-01-30");
+INSERT INTO diaries (title, created_at) VALUES ("cloudy day", "2012-01-31");
+SELECT * FROM diaries;
+id	title	created_at
+1	clear day	2012-01-29
+2	rainy day	2012-01-30
+3	cloudy day	2012-01-31
+SELECT * FROM diaries WHERE created_at BETWEEN "2012-01-29" AND "2012-01-30";
+id	title	created_at
+1	clear day	2012-01-29
+2	rainy day	2012-01-30
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_datetime_with_fractional_seconds_with_index.result'
--- mysql-test/suite/mroonga_storage/r/column_datetime_with_fractional_seconds_with_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_datetime_with_fractional_seconds_with_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,34 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+created_at DATETIME(6),
+KEY (created_at)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `created_at` datetime(6) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `created_at` (`created_at`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, created_at)
+VALUES ("clear day", "2012-01-29 21:51:01.111111");
+INSERT INTO diaries (title, created_at)
+VALUES ("rainy day", "2012-01-30 01:23:45.333");
+INSERT INTO diaries (title, created_at)
+VALUES ("cloudy day", "2012-01-31 08:32:10.5555");
+SELECT * FROM diaries;
+id	title	created_at
+1	clear day	2012-01-29 21:51:01.111111
+2	rainy day	2012-01-30 01:23:45.333000
+3	cloudy day	2012-01-31 08:32:10.555500
+SELECT * FROM diaries
+WHERE created_at BETWEEN "2012-01-29 00:00:00.123456" AND
+"2012-01-31 00:00:00.999999";
+id	title	created_at
+1	clear day	2012-01-29 21:51:01.111111
+2	rainy day	2012-01-30 01:23:45.333000
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_datetime_with_fractional_seconds_without_index.result'
--- mysql-test/suite/mroonga_storage/r/column_datetime_with_fractional_seconds_without_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_datetime_with_fractional_seconds_without_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,32 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+created_at DATETIME(6)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `created_at` datetime(6) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, created_at)
+VALUES ("clear day", "2012-01-29 21:51:01.111111");
+INSERT INTO diaries (title, created_at)
+VALUES ("rainy day", "2012-01-30 01:23:45.333");
+INSERT INTO diaries (title, created_at)
+VALUES ("cloudy day", "2012-01-31 08:32:10.5555");
+SELECT * FROM diaries;
+id	title	created_at
+1	clear day	2012-01-29 21:51:01.111111
+2	rainy day	2012-01-30 01:23:45.333000
+3	cloudy day	2012-01-31 08:32:10.555500
+SELECT * FROM diaries
+WHERE created_at BETWEEN "2012-01-29 00:00:00.123456" AND
+"2012-01-31 00:00:00.999999";
+id	title	created_at
+1	clear day	2012-01-29 21:51:01.111111
+2	rainy day	2012-01-30 01:23:45.333000
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_datetime_without_fractional_seconds_with_index.result'
--- mysql-test/suite/mroonga_storage/r/column_datetime_without_fractional_seconds_with_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_datetime_without_fractional_seconds_with_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,33 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+created_at DATETIME,
+KEY (created_at)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `created_at` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `created_at` (`created_at`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, created_at)
+VALUES ("clear day", "2012-01-29 21:51:01");
+INSERT INTO diaries (title, created_at)
+VALUES ("rainy day", "2012-01-30 01:23:45");
+INSERT INTO diaries (title, created_at)
+VALUES ("cloudy day", "2012-01-31 08:32:10");
+SELECT * FROM diaries;
+id	title	created_at
+1	clear day	2012-01-29 21:51:01
+2	rainy day	2012-01-30 01:23:45
+3	cloudy day	2012-01-31 08:32:10
+SELECT * FROM diaries
+WHERE created_at BETWEEN "2012-01-29 00:00:00" AND "2012-01-31 00:00:00";
+id	title	created_at
+1	clear day	2012-01-29 21:51:01
+2	rainy day	2012-01-30 01:23:45
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_datetime_without_fractional_seconds_without_index.result'
--- mysql-test/suite/mroonga_storage/r/column_datetime_without_fractional_seconds_without_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_datetime_without_fractional_seconds_without_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,31 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+created_at DATETIME
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `created_at` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, created_at)
+VALUES ("clear day", "2012-01-29 21:51:01");
+INSERT INTO diaries (title, created_at)
+VALUES ("rainy day", "2012-01-30 01:23:45");
+INSERT INTO diaries (title, created_at)
+VALUES ("cloudy day", "2012-01-31 08:32:10");
+SELECT * FROM diaries;
+id	title	created_at
+1	clear day	2012-01-29 21:51:01
+2	rainy day	2012-01-30 01:23:45
+3	cloudy day	2012-01-31 08:32:10
+SELECT * FROM diaries
+WHERE created_at BETWEEN "2012-01-29 00:00:00" AND "2012-01-31 00:00:00";
+id	title	created_at
+1	clear day	2012-01-29 21:51:01
+2	rainy day	2012-01-30 01:23:45
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_decimal_with_fractional_seconds_with_index.result'
--- mysql-test/suite/mroonga_storage/r/column_decimal_with_fractional_seconds_with_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_decimal_with_fractional_seconds_with_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,29 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+temperature DECIMAL(6, 3),
+KEY (temperature)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `temperature` decimal(6,3) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `temperature` (`temperature`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, temperature) VALUES ("clear day", 21.281);
+INSERT INTO diaries (title, temperature) VALUES ("rainy day", 14.213);
+INSERT INTO diaries (title, temperature) VALUES ("cloudy day", 17.821);
+SELECT * FROM diaries;
+id	title	temperature
+1	clear day	21.281
+2	rainy day	14.213
+3	cloudy day	17.821
+SELECT * FROM diaries WHERE temperature BETWEEN "14.213" AND "17.821";
+id	title	temperature
+2	rainy day	14.213
+3	cloudy day	17.821
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_decimal_with_fractional_seconds_without_index.result'
--- mysql-test/suite/mroonga_storage/r/column_decimal_with_fractional_seconds_without_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_decimal_with_fractional_seconds_without_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,27 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+temperature DECIMAL(6, 3)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `temperature` decimal(6,3) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, temperature) VALUES ("clear day", 21.281);
+INSERT INTO diaries (title, temperature) VALUES ("rainy day", 14.213);
+INSERT INTO diaries (title, temperature) VALUES ("cloudy day", 17.821);
+SELECT * FROM diaries;
+id	title	temperature
+1	clear day	21.281
+2	rainy day	14.213
+3	cloudy day	17.821
+SELECT * FROM diaries WHERE temperature BETWEEN "14.213" AND "17.821";
+id	title	temperature
+2	rainy day	14.213
+3	cloudy day	17.821
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_decimal_without_fractional_seconds_with_index.result'
--- mysql-test/suite/mroonga_storage/r/column_decimal_without_fractional_seconds_with_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_decimal_without_fractional_seconds_with_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,29 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+temperature DECIMAL,
+KEY (temperature)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `temperature` decimal(10,0) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `temperature` (`temperature`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, temperature) VALUES ("clear day", 21);
+INSERT INTO diaries (title, temperature) VALUES ("rainy day", 14);
+INSERT INTO diaries (title, temperature) VALUES ("cloudy day", 17);
+SELECT * FROM diaries;
+id	title	temperature
+1	clear day	21
+2	rainy day	14
+3	cloudy day	17
+SELECT * FROM diaries WHERE temperature BETWEEN "14" AND "17";
+id	title	temperature
+2	rainy day	14
+3	cloudy day	17
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_decimal_without_fractional_seconds_without_index.result'
--- mysql-test/suite/mroonga_storage/r/column_decimal_without_fractional_seconds_without_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_decimal_without_fractional_seconds_without_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,27 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+temperature DECIMAL
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `temperature` decimal(10,0) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, temperature) VALUES ("clear day", 21);
+INSERT INTO diaries (title, temperature) VALUES ("rainy day", 14);
+INSERT INTO diaries (title, temperature) VALUES ("cloudy day", 17);
+SELECT * FROM diaries;
+id	title	temperature
+1	clear day	21
+2	rainy day	14
+3	cloudy day	17
+SELECT * FROM diaries WHERE temperature BETWEEN "14" AND "17";
+id	title	temperature
+2	rainy day	14
+3	cloudy day	17
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_enum_less_with_index.result'
--- mysql-test/suite/mroonga_storage/r/column_enum_less_with_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_enum_less_with_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,28 @@
+DROP TABLE IF EXISTS items;
+CREATE TABLE items (
+name VARCHAR(255),
+size ENUM("small", "medium", "large"),
+INDEX (size)
+) ENGINE=mroonga DEFAULT CHARSET=utf8;
+SHOW CREATE TABLE items;
+Table	Create Table
+items	CREATE TABLE `items` (
+  `name` varchar(255) DEFAULT NULL,
+  `size` enum('small','medium','large') DEFAULT NULL,
+  KEY `size` (`size`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO items VALUES ("t-shart for child", "small");
+INSERT INTO items VALUES ("leadies' coat", "medium");
+INSERT INTO items VALUES ("parka", "large");
+INSERT INTO items VALUES ("hat", "medium");
+SELECT * FROM items;
+name	size
+t-shart for child	small
+leadies' coat	medium
+parka	large
+hat	medium
+SELECT * FROM items WHERE size = "medium";
+name	size
+leadies' coat	medium
+hat	medium
+DROP TABLE items;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_enum_many_with_index.result'
--- mysql-test/suite/mroonga_storage/r/column_enum_many_with_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_enum_many_with_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,287 @@
+DROP TABLE IF EXISTS items;
+CREATE TABLE items (
+name VARCHAR(255),
+size ENUM("size1",
+"size2",
+"size3",
+"size4",
+"size5",
+"size6",
+"size7",
+"size8",
+"size9",
+"size10",
+"size11",
+"size12",
+"size13",
+"size14",
+"size15",
+"size16",
+"size17",
+"size18",
+"size19",
+"size20",
+"size21",
+"size22",
+"size23",
+"size24",
+"size25",
+"size26",
+"size27",
+"size28",
+"size29",
+"size30",
+"size31",
+"size32",
+"size33",
+"size34",
+"size35",
+"size36",
+"size37",
+"size38",
+"size39",
+"size40",
+"size41",
+"size42",
+"size43",
+"size44",
+"size45",
+"size46",
+"size47",
+"size48",
+"size49",
+"size50",
+"size51",
+"size52",
+"size53",
+"size54",
+"size55",
+"size56",
+"size57",
+"size58",
+"size59",
+"size60",
+"size61",
+"size62",
+"size63",
+"size64",
+"size65",
+"size66",
+"size67",
+"size68",
+"size69",
+"size70",
+"size71",
+"size72",
+"size73",
+"size74",
+"size75",
+"size76",
+"size77",
+"size78",
+"size79",
+"size80",
+"size81",
+"size82",
+"size83",
+"size84",
+"size85",
+"size86",
+"size87",
+"size88",
+"size89",
+"size90",
+"size91",
+"size92",
+"size93",
+"size94",
+"size95",
+"size96",
+"size97",
+"size98",
+"size99",
+"size100",
+"size101",
+"size102",
+"size103",
+"size104",
+"size105",
+"size106",
+"size107",
+"size108",
+"size109",
+"size110",
+"size111",
+"size112",
+"size113",
+"size114",
+"size115",
+"size116",
+"size117",
+"size118",
+"size119",
+"size120",
+"size121",
+"size122",
+"size123",
+"size124",
+"size125",
+"size126",
+"size127",
+"size128",
+"size129",
+"size130",
+"size131",
+"size132",
+"size133",
+"size134",
+"size135",
+"size136",
+"size137",
+"size138",
+"size139",
+"size140",
+"size141",
+"size142",
+"size143",
+"size144",
+"size145",
+"size146",
+"size147",
+"size148",
+"size149",
+"size150",
+"size151",
+"size152",
+"size153",
+"size154",
+"size155",
+"size156",
+"size157",
+"size158",
+"size159",
+"size160",
+"size161",
+"size162",
+"size163",
+"size164",
+"size165",
+"size166",
+"size167",
+"size168",
+"size169",
+"size170",
+"size171",
+"size172",
+"size173",
+"size174",
+"size175",
+"size176",
+"size177",
+"size178",
+"size179",
+"size180",
+"size181",
+"size182",
+"size183",
+"size184",
+"size185",
+"size186",
+"size187",
+"size188",
+"size189",
+"size190",
+"size191",
+"size192",
+"size193",
+"size194",
+"size195",
+"size196",
+"size197",
+"size198",
+"size199",
+"size200",
+"size201",
+"size202",
+"size203",
+"size204",
+"size205",
+"size206",
+"size207",
+"size208",
+"size209",
+"size210",
+"size211",
+"size212",
+"size213",
+"size214",
+"size215",
+"size216",
+"size217",
+"size218",
+"size219",
+"size220",
+"size221",
+"size222",
+"size223",
+"size224",
+"size225",
+"size226",
+"size227",
+"size228",
+"size229",
+"size230",
+"size231",
+"size232",
+"size233",
+"size234",
+"size235",
+"size236",
+"size237",
+"size238",
+"size239",
+"size240",
+"size241",
+"size242",
+"size243",
+"size244",
+"size245",
+"size246",
+"size247",
+"size248",
+"size249",
+"size250",
+"size251",
+"size252",
+"size253",
+"size254",
+"size255",
+"size256"),
+INDEX (size)
+) ENGINE=mroonga DEFAULT CHARSET=utf8;
+SHOW CREATE TABLE items;
+Table	Create Table
+items	CREATE TABLE `items` (
+  `name` varchar(255) DEFAULT NULL,
+  `size` enum('size1','size2','size3','size4','size5','size6','size7','size8','size9','size10','size11','size12','size13','size14','size15','size16','size17','size18','size19','size20','size21','size22','size23','size24','size25','size26','size27','size28','size29','size30','size31','size32','size33','size34','size35','size36','size37','size38','size39','size40','size41','size42','size43','size44','size45','size46','size47','size48','size49','size50','size51','size52','size53','size54','size55','size56','size57','size58','size59','size60','size61','size62','size63','size64','size65','size66','size67','size68','size69','size70','size71','size72','size73','size74','size75','size76','size77','size78','size79','size80','size81','size82','size83','size84','size85','size86','size87','size88','size89','size90','size91','size92','size93','size94','size95','size96','size97','size98','size99','size100','size101','size102','size103','size104','size105','size106','size107','size108','size109','size110','size111','size112','size113','size114','size115','size116','size117','size118','size119','size120','size121','size122','size123','size124','size125','size126','size127','size128','size129','size130','size131','size132','size133','size134','size135','size136','size137','size138','size139','size140','size141','size142','size143','size144','size145','size146','size147','size148','size149','size150','size151','size152','size153','size154','size155','size156','size157','size158','size159','size160','size161','size162','size163','size164','size165','size166','size167','size168','size169','size170','size171','size172','size173','size174','size175','size176','size177','size178','size179','size180','size181','size182','size183','size184','size185','size186','size187','size188','size189','size190','size191','size192','size193','size194','size195','size196','size197','size198','size199','size200','size201','size202','size203','size204','size205','size206','size207','size208','size209','size210','size211','size212','size213','size214','size215','size216','size217','size218','size219','size220','size221','size222','size223','size224','size225','size226','size227','size228','size229','size230','size231','size232','size233','size234','size235','size236','size237','size238','size239','size240','size241','size242','size243','size244','size245','size246','size247','size248','size249','size250','size251','size252','size253','size254','size255','size256') DEFAULT NULL,
+  KEY `size` (`size`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO items VALUES ("t-shart for child", "size1");
+INSERT INTO items VALUES ("leadies' coat", "size1");
+INSERT INTO items VALUES ("parka", "size256");
+INSERT INTO items VALUES ("hat", "size256");
+SELECT * FROM items;
+name	size
+t-shart for child	size1
+leadies' coat	size1
+parka	size256
+hat	size256
+SELECT * FROM items WHERE size = "size1";
+name	size
+t-shart for child	size1
+leadies' coat	size1
+SELECT * FROM items WHERE size = "size256";
+name	size
+parka	size256
+hat	size256
+DROP TABLE items;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_int_with_index_zero_value.result'
--- mysql-test/suite/mroonga_storage/r/column_int_with_index_zero_value.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_int_with_index_zero_value.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS items;
+CREATE TABLE items (
+name VARCHAR(255),
+price INT KEY
+) ENGINE=mroonga DEFAULT CHARSET=utf8;
+INSERT INTO items VALUES ("hamburger", 200);
+INSERT INTO items VALUES ("smile", 0);
+INSERT INTO items VALUES ("coke", 100);
+SELECT * FROM items;
+name	price
+smile	0
+coke	100
+hamburger	200
+SELECT * FROM items WHERE price = 0;
+name	price
+smile	0
+SELECT * FROM items WHERE price <= 100;
+name	price
+smile	0
+coke	100
+DROP TABLE items;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_time_with_fractional_seconds.result'
--- mysql-test/suite/mroonga_storage/r/column_time_with_fractional_seconds.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_time_with_fractional_seconds.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,40 @@
+DROP TABLE IF EXISTS running_records;
+CREATE TABLE running_records (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+average TIME(6),
+max TIME(6),
+KEY (average)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE running_records;
+Table	Create Table
+running_records	CREATE TABLE `running_records` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `average` time(6) DEFAULT NULL,
+  `max` time(6) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `average` (`average`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO running_records (title, average, max)
+VALUES ("normal condition", "01:00:00.000001", "01:05:00.000001");
+INSERT INTO running_records (title, average, max)
+VALUES ("bad condition", "12:23:34.123456", "838:59:58.999999");
+INSERT INTO running_records (title, average, max)
+VALUES ("record failure", "-838:59:59.000000", "-838:59:59.000000");
+SELECT * FROM running_records;
+id	title	average	max
+1	normal condition	01:00:00.000001	01:05:00.000001
+2	bad condition	12:23:34.123456	838:59:58.999999
+3	record failure	-838:59:59.000000	-838:59:59.000000
+SELECT * FROM running_records
+WHERE average BETWEEN "00:59:59.999999" AND "100:10:10.101010";
+id	title	average	max
+1	normal condition	01:00:00.000001	01:05:00.000001
+2	bad condition	12:23:34.123456	838:59:58.999999
+SELECT * FROM running_records
+WHERE average BETWEEN "-838:59:59.000000" AND "01:00:00.000001";
+id	title	average	max
+3	record failure	-838:59:59.000000	-838:59:59.000000
+1	normal condition	01:00:00.000001	01:05:00.000001
+DROP TABLE running_records;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_time_without_fractional_seconds.result'
--- mysql-test/suite/mroonga_storage/r/column_time_without_fractional_seconds.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_time_without_fractional_seconds.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,40 @@
+DROP TABLE IF EXISTS running_records;
+CREATE TABLE running_records (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+average TIME,
+max TIME,
+KEY (average)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE running_records;
+Table	Create Table
+running_records	CREATE TABLE `running_records` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `average` time DEFAULT NULL,
+  `max` time DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `average` (`average`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO running_records (title, average, max)
+VALUES ("normal condition", "01:00:00", "01:05:00");
+INSERT INTO running_records (title, average, max)
+VALUES ("bad condition", "12:23:34", "838:59:59");
+INSERT INTO running_records (title, average, max)
+VALUES ("record failure", "-838:59:59", "-838:59:59");
+SELECT * FROM running_records;
+id	title	average	max
+1	normal condition	01:00:00	01:05:00
+2	bad condition	12:23:34	838:59:59
+3	record failure	-838:59:59	-838:59:59
+SELECT * FROM running_records
+WHERE average BETWEEN "00:59:59" AND "100:10:10";
+id	title	average	max
+1	normal condition	01:00:00	01:05:00
+2	bad condition	12:23:34	838:59:59
+SELECT * FROM running_records
+WHERE average BETWEEN "-838:59:59" AND "01:00:00";
+id	title	average	max
+3	record failure	-838:59:59	-838:59:59
+1	normal condition	01:00:00	01:05:00
+DROP TABLE running_records;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_timestamp_with_fractional_seconds.result'
--- mysql-test/suite/mroonga_storage/r/column_timestamp_with_fractional_seconds.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_timestamp_with_fractional_seconds.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,42 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+created_at TIMESTAMP(6),
+updated_at TIMESTAMP(6),
+KEY (updated_at)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `updated_at` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000',
+  PRIMARY KEY (`id`),
+  KEY `updated_at` (`updated_at`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, created_at, updated_at)
+VALUES ("clear day",
+"2012-01-29 21:51:01.111111",
+"2012-01-29 21:51:02.222222");
+INSERT INTO diaries (title, created_at, updated_at)
+VALUES ("rainy day",
+"2012-01-30 01:23:45.333",
+"2012-01-30 01:23:46.444");
+INSERT INTO diaries (title, created_at, updated_at)
+VALUES ("cloudy day",
+"2012-01-31 08:32:10.5555",
+"2012-01-31 08:32:11.6666");
+SELECT * FROM diaries;
+id	title	created_at	updated_at
+1	clear day	2012-01-29 21:51:01.111111	2012-01-29 21:51:02.222222
+2	rainy day	2012-01-30 01:23:45.333000	2012-01-30 01:23:46.444000
+3	cloudy day	2012-01-31 08:32:10.555500	2012-01-31 08:32:11.666600
+SELECT * FROM diaries
+WHERE updated_at BETWEEN "2012-01-29 00:00:00.123456" AND
+"2012-01-31 00:00:00.999999";
+id	title	created_at	updated_at
+1	clear day	2012-01-29 21:51:01.111111	2012-01-29 21:51:02.222222
+2	rainy day	2012-01-30 01:23:45.333000	2012-01-30 01:23:46.444000
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_timestamp_without_fractional_seconds.result'
--- mysql-test/suite/mroonga_storage/r/column_timestamp_without_fractional_seconds.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_timestamp_without_fractional_seconds.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,35 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+created_at TIMESTAMP,
+updated_at TIMESTAMP,
+KEY (updated_at)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `updated_at` (`updated_at`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, created_at, updated_at)
+VALUES ("clear day", "2012-01-29 21:51:01", "2012-01-29 21:51:02");
+INSERT INTO diaries (title, created_at, updated_at)
+VALUES ("rainy day", "2012-01-30 01:23:45", "2012-01-30 01:23:46");
+INSERT INTO diaries (title, created_at, updated_at)
+VALUES ("cloudy day", "2012-01-31 08:32:10", "2012-01-31 08:32:11");
+SELECT * FROM diaries;
+id	title	created_at	updated_at
+1	clear day	2012-01-29 21:51:01	2012-01-29 21:51:02
+2	rainy day	2012-01-30 01:23:45	2012-01-30 01:23:46
+3	cloudy day	2012-01-31 08:32:10	2012-01-31 08:32:11
+SELECT * FROM diaries
+WHERE updated_at BETWEEN "2012-01-29 00:00:00" AND "2012-01-31 00:00:00";
+id	title	created_at	updated_at
+1	clear day	2012-01-29 21:51:01	2012-01-29 21:51:02
+2	rainy day	2012-01-30 01:23:45	2012-01-30 01:23:46
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_year_with_index.result'
--- mysql-test/suite/mroonga_storage/r/column_year_with_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_year_with_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,37 @@
+DROP TABLE IF EXISTS aniversary_memos;
+CREATE TABLE aniversary_memos (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+party_year YEAR,
+KEY (party_year)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE aniversary_memos;
+Table	Create Table
+aniversary_memos	CREATE TABLE `aniversary_memos` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `party_year` year(4) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `party_year` (`party_year`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO aniversary_memos (title, party_year)
+VALUES ("We need a big cake!", "11");
+INSERT INTO aniversary_memos (title, party_year)
+VALUES ("Invitations are sent.", "2012");
+INSERT INTO aniversary_memos (title, party_year)
+VALUES ("Tommorow is the anniversary party day!", "2012");
+INSERT INTO aniversary_memos (title, party_year)
+VALUES ("Wow! Today is the anniversary party day!", "13");
+SELECT * FROM aniversary_memos;
+id	title	party_year
+1	We need a big cake!	2011
+2	Invitations are sent.	2012
+3	Tommorow is the anniversary party day!	2012
+4	Wow! Today is the anniversary party day!	2013
+SELECT * FROM aniversary_memos
+WHERE party_year BETWEEN "12" AND "2013";
+id	title	party_year
+2	Invitations are sent.	2012
+3	Tommorow is the anniversary party day!	2012
+4	Wow! Today is the anniversary party day!	2013
+DROP TABLE aniversary_memos;
 
=== added file 'mysql-test/suite/mroonga_storage/r/column_year_without_index.result'
--- mysql-test/suite/mroonga_storage/r/column_year_without_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/column_year_without_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,35 @@
+DROP TABLE IF EXISTS aniversary_memos;
+CREATE TABLE aniversary_memos (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+party_year YEAR
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE aniversary_memos;
+Table	Create Table
+aniversary_memos	CREATE TABLE `aniversary_memos` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `party_year` year(4) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO aniversary_memos (title, party_year)
+VALUES ("We need a big cake!", "11");
+INSERT INTO aniversary_memos (title, party_year)
+VALUES ("Invitations are sent.", "2012");
+INSERT INTO aniversary_memos (title, party_year)
+VALUES ("Tommorow is the anniversary party day!", "2012");
+INSERT INTO aniversary_memos (title, party_year)
+VALUES ("Wow! Today is the anniversary party day!", "13");
+SELECT * FROM aniversary_memos;
+id	title	party_year
+1	We need a big cake!	2011
+2	Invitations are sent.	2012
+3	Tommorow is the anniversary party day!	2012
+4	Wow! Today is the anniversary party day!	2013
+SELECT * FROM aniversary_memos
+WHERE party_year BETWEEN "12" AND "2013";
+id	title	party_year
+2	Invitations are sent.	2012
+3	Tommorow is the anniversary party day!	2012
+4	Wow! Today is the anniversary party day!	2013
+DROP TABLE aniversary_memos;
 
=== added file 'mysql-test/suite/mroonga_storage/r/create_database_name_slash.result'
--- mysql-test/suite/mroonga_storage/r/create_database_name_slash.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/create_database_name_slash.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,33 @@
+DROP DATABASE IF EXISTS `master/production`;
+DROP DATABASE IF EXISTS `master/development`;
+CREATE DATABASE `master/production`;
+USE `master/production`;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT
+) DEFAULT CHARSET=UTF8;
+INSERT INTO diaries (title) VALUES ("clear day (production)");
+INSERT INTO diaries (title) VALUES ("rainy day (production)");
+INSERT INTO diaries (title) VALUES ("cloudy day (production)");
+SELECT * FROM diaries;
+id	title
+1	clear day (production)
+2	rainy day (production)
+3	cloudy day (production)
+CREATE DATABASE `master/development`;
+USE `master/development`;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT
+) DEFAULT CHARSET=UTF8;
+INSERT INTO diaries (title) VALUES ("clear day (development)");
+INSERT INTO diaries (title) VALUES ("rainy day (development)");
+INSERT INTO diaries (title) VALUES ("cloudy day (development)");
+SELECT * FROM diaries;
+id	title
+1	clear day (development)
+2	rainy day (development)
+3	cloudy day (development)
+USE test;
+DROP DATABASE `master/production`;
+DROP DATABASE `master/development`;
 
=== added file 'mysql-test/suite/mroonga_storage/r/create_table.result'
--- mysql-test/suite/mroonga_storage/r/create_table.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/create_table.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,172 @@
+drop table if exists t1, t2, t3;
+create table t1 (c1 int);
+create table t2 (c1 int);
+create table t3 (c1 int);
+drop table t1,t2,t3;
+create table t1 (c1 int, c2 int, c3 int);
+create table t2 (c1 int primary key, c2 int, c3 int);
+drop table t1,t2;
+create table t1 (c1 bit);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	bit(1)	YES		NULL	
+drop table t1;
+create table t1 (c1 tinyint);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	tinyint(4)	YES		NULL	
+drop table t1;
+create table t1 (c1 smallint);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	smallint(6)	YES		NULL	
+drop table t1;
+create table t1 (c1 mediumint);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	mediumint(9)	YES		NULL	
+drop table t1;
+create table t1 (c1 int);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	int(11)	YES		NULL	
+drop table t1;
+create table t1 (c1 bigint);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	bigint(20)	YES		NULL	
+drop table t1;
+create table t1 (c1 double);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	double	YES		NULL	
+drop table t1;
+create table t1 (c1 float);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	float	YES		NULL	
+drop table t1;
+create table t1 (c1 decimal);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	decimal(10,0)	YES		NULL	
+drop table t1;
+create table t1 (c1 date);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	date	YES		NULL	
+drop table t1;
+create table t1 (c1 time);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	time	YES		NULL	
+drop table t1;
+create table t1 (c1 timestamp);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	timestamp	NO		CURRENT_TIMESTAMP	on update CURRENT_TIMESTAMP
+drop table t1;
+create table t1 (c1 datetime);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	datetime	YES		NULL	
+drop table t1;
+create table t1 (c1 year);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	year(4)	YES		NULL	
+drop table t1;
+create table t1 (c1 char(10));
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	char(10)	YES		NULL	
+drop table t1;
+create table t1 (c1 varchar(10));
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	varchar(10)	YES		NULL	
+drop table t1;
+create table t1 (c1 binary(10));
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	binary(10)	YES		NULL	
+drop table t1;
+create table t1 (c1 varbinary(10));
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	varbinary(10)	YES		NULL	
+drop table t1;
+create table t1 (c1 tinyblob);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	tinyblob	YES		NULL	
+drop table t1;
+create table t1 (c1 blob);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	blob	YES		NULL	
+drop table t1;
+create table t1 (c1 mediumblob);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	mediumblob	YES		NULL	
+drop table t1;
+create table t1 (c1 longblob);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	longblob	YES		NULL	
+drop table t1;
+create table t1 (c1 tinytext);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	tinytext	YES		NULL	
+drop table t1;
+create table t1 (c1 text);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	text	YES		NULL	
+drop table t1;
+create table t1 (c1 mediumtext);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	mediumtext	YES		NULL	
+drop table t1;
+create table t1 (c1 longtext);
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	longtext	YES		NULL	
+drop table t1;
+create table t1 (c1 enum("yes","no"));
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	enum('yes','no')	YES		NULL	
+drop table t1;
+create table t1 (c1 set("A","B","AB","O"));
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	set('A','B','AB','O')	YES		NULL	
+drop table t1;
+create table t1 (c1 int, `_id` int) engine = mroonga;
+desc t1;
+Field	Type	Null	Key	Default	Extra
+c1	int(11)	YES		NULL	
+_id	int(11)	YES		NULL	
+drop table t1;
+create table t1 (c1 int, `_score` float) engine = mroonga;
+ERROR HY000: [column][create] name can't start with '_' and contains only 0-9, A-Z, a-z, #, @, - or _: <_score>
+create table t1 (c1 int, `_id` text) engine = mroonga;
+ERROR HY000: _id must be numeric data type
+create table t1 (c1 int, `_id` int, index(`_id`)) engine = mroonga;
+ERROR HY000: only hash index can be defined for _id
+create table t1 (_id int, c1 int, primary key (_id));
+ERROR HY000: only hash index can be defined for _id
+create table t1 (_id int, c1 int, primary key (_id) using hash);
+drop table t1;
+create table t1 (_id int, c1 int, unique key (_id));
+ERROR HY000: only hash index can be defined for _id
+create table t1 (_id int, c1 int, unique key (_id) using hash);
+drop table t1;
+create table t1 (_id int, c1 int, key (_id));
+ERROR HY000: only hash index can be defined for _id
+create table t1 (_id int, c1 int, key (_id) using hash);
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/delete_fulltext_column.result'
--- mysql-test/suite/mroonga_storage/r/delete_fulltext_column.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/delete_fulltext_column.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,21 @@
+drop table if exists t1, t2, t3;
+create table t1 (c1 int primary key, c2 text, fulltext index (c2));
+insert into t1 values(10, "aa ii uu ee");
+insert into t1 values(20, "ka ki ku ke");
+insert into t1 values(30, "sa si su se");
+select * from t1;
+c1	c2
+10	aa ii uu ee
+20	ka ki ku ke
+30	sa si su se
+select * from t1 where match(c2) against("ki");
+c1	c2
+20	ka ki ku ke
+delete from t1 where c1=20;
+select * from t1;
+c1	c2
+10	aa ii uu ee
+30	sa si su se
+select * from t1 where match(c2) against("ki");
+c1	c2
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/delete_id_index_hash_no_unique.result'
--- mysql-test/suite/mroonga_storage/r/delete_id_index_hash_no_unique.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/delete_id_index_hash_no_unique.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,19 @@
+drop table if exists t1, t2, t3;
+create table t1 (_id int, c1 int, key (_id) using hash);
+insert into t1 values(null, 100);
+insert into t1 values(null, 100);
+insert into t1 values(null, 100);
+insert into t1 values(null, 100);
+select * from t1;
+_id	c1
+1	100
+2	100
+3	100
+4	100
+delete from t1 where _id = 2;
+select * from t1;
+_id	c1
+1	100
+3	100
+4	100
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/delete_id_index_hash_unique.result'
--- mysql-test/suite/mroonga_storage/r/delete_id_index_hash_unique.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/delete_id_index_hash_unique.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,19 @@
+drop table if exists t1, t2, t3;
+create table t1 (_id int, c1 int, unique key (_id) using hash);
+insert into t1 values(null, 100);
+insert into t1 values(null, 100);
+insert into t1 values(null, 100);
+insert into t1 values(null, 100);
+select * from t1;
+_id	c1
+1	100
+2	100
+3	100
+4	100
+delete from t1 where _id = 2;
+select * from t1;
+_id	c1
+1	100
+3	100
+4	100
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/delete_normal_column.result'
--- mysql-test/suite/mroonga_storage/r/delete_normal_column.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/delete_normal_column.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,34 @@
+drop table if exists t1, t2, t3;
+create table t1 (c1 int, c2 int);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) DEFAULT NULL,
+  `c2` int(11) DEFAULT NULL
+) ENGINE=mroonga DEFAULT CHARSET=latin1
+insert into t1 values (1, 100);
+insert into t1 values (2, 101);
+insert into t1 values (3, 102);
+insert into t1 values (4, 102);
+select * from t1;
+c1	c2
+1	100
+2	101
+3	102
+4	102
+delete from t1 where c1=3;
+select * from t1;
+c1	c2
+1	100
+2	101
+4	102
+flush tables;
+delete from t1 where c1=2;
+select * from t1;
+c1	c2
+1	100
+4	102
+delete from t1;
+select * from t1;
+c1	c2
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/drop_database.result'
--- mysql-test/suite/mroonga_storage/r/drop_database.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/drop_database.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,14 @@
+drop database if exists groonga;
+create database groonga;
+drop database groonga;
+create database groonga;
+use groonga;
+create table t1 (c1 int primary key, c2 varchar(255)) default charset utf8;
+create table t2 (c1 int primary key, c2 varchar(255)) default charset utf8;
+drop database groonga;
+create database groonga;
+use groonga;
+create table t1 (c1 int primary key, c2 varchar(255)) default charset utf8;
+create table t2 (c1 int primary key, c2 varchar(255)) default charset utf8;
+drop table t1, t2;
+drop database groonga;
 
=== added file 'mysql-test/suite/mroonga_storage/r/drop_table.result'
--- mysql-test/suite/mroonga_storage/r/drop_table.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/drop_table.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,5 @@
+drop table if exists alphabet, `with-hyphen`;
+create table alphabet (c1 int primary key, c2 int, c3 int);
+drop table alphabet;
+create table `with-hyphen` (c1 int primary key, c2 int, c3 int);
+drop table `with-hyphen`;
 
=== added file 'mysql-test/suite/mroonga_storage/r/dry_write_delete.result'
--- mysql-test/suite/mroonga_storage/r/dry_write_delete.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/dry_write_delete.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,28 @@
+drop table if exists diaries;
+create table diaries (
+id int primary key auto_increment,
+body text,
+fulltext index body_index (body)
+) default charset utf8;
+show create table diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `body` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `body_index` (`body`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into diaries (body) values ("will start groonga!");
+select * from diaries;
+id	body
+1	will start groonga!
+set mroonga_dry_write=true;
+delete from diaries where id = 1;
+select * from diaries;
+id	body
+1	will start groonga!
+set mroonga_dry_write=false;
+delete from diaries where id = 1;
+select * from diaries;
+id	body
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/dry_write_insert.result'
--- mysql-test/suite/mroonga_storage/r/dry_write_insert.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/dry_write_insert.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,30 @@
+drop table if exists diaries;
+create table diaries (
+id int primary key auto_increment,
+body text,
+fulltext index body_index (body)
+) default charset utf8;
+show create table diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `body` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `body_index` (`body`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into diaries (body) values ("will start groonga!");
+select * from diaries;
+id	body
+1	will start groonga!
+set mroonga_dry_write=true;
+insert into diaries (body) values ("starting groonga...");
+select * from diaries;
+id	body
+1	will start groonga!
+set mroonga_dry_write=false;
+insert into diaries (body) values ("started groonga.");
+select * from diaries;
+id	body
+1	will start groonga!
+2	started groonga.
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/dry_write_update.result'
--- mysql-test/suite/mroonga_storage/r/dry_write_update.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/dry_write_update.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,26 @@
+drop table if exists diaries;
+create table diaries (
+id int primary key auto_increment,
+body text,
+fulltext index body_index (body)
+) default charset utf8;
+show create table diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `body` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `body_index` (`body`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into diaries (body) values ("will start groonga!");
+set mroonga_dry_write=true;
+update diaries set body = "starting groonga..." where id = 1;
+select * from diaries;
+id	body
+1	will start groonga!
+set mroonga_dry_write=false;
+update diaries set body = "starting groonga..." where id = 1;
+select * from diaries;
+id	body
+1	starting groonga...
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/flush_logs.result'
--- mysql-test/suite/mroonga_storage/r/flush_logs.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/flush_logs.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,1 @@
+flush logs;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_boolean_mode_pragma_default_operator.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_boolean_mode_pragma_default_operator.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_boolean_mode_pragma_default_operator.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,45 @@
+drop table if exists diaries;
+set names utf8;
+create table diaries (
+id int primary key,
+title varchar(255),
+content text,
+fulltext index (content)
+) default charset utf8;
+show create table diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `content` (`content`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into diaries values(1, "Hello", "今日�ら������。");
+insert into diaries values(2, "天気", "明日�富士山�天気����");
+insert into diaries values(3, "富士山", "今日も天気�よ���れ��見�る。");
+select * from diaries where match(content) against("今日 天気" in boolean mode);
+id	title	content
+1	Hello	今日�ら������。
+3	富士山	今日も天気�よ���れ��見�る。
+2	天気	明日�富士山�天気����
+select * from diaries where match(content) against("*D+ 今日 天気" in boolean mode);
+id	title	content
+3	富士山	今日も天気�よ���れ��見�る。
+select * from diaries where match(content) against("*D- 今日 天気" in boolean mode);
+id	title	content
+1	Hello	今日�ら������。
+3	富士山	今日も天気�よ���れ��見�る。
+2	天気	明日�富士山�天気����
+select * from diaries where match(content) against("*D- +今日 +天気" in boolean mode);
+id	title	content
+3	富士山	今日も天気�よ���れ��見�る。
+select * from diaries where match(content) against("*DOR 今日 天気" in boolean mode);
+id	title	content
+1	Hello	今日�ら������。
+3	富士山	今日も天気�よ���れ��見�る。
+2	天気	明日�富士山�天気����
+select * from diaries where match(content) against("*DOR +今日 +天気" in boolean mode);
+id	title	content
+3	富士山	今日も天気�よ���れ��見�る。
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_found_rows.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_found_rows.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_found_rows.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,42 @@
+DROP TABLE IF EXISTS diaries;
+SET NAMES UTF8;
+CREATE TABLE diaries (
+id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+year INT UNSIGNED,
+month INT UNSIGNED,
+day INT UNSIGNED,
+title VARCHAR(255),
+content TEXT,
+FULLTEXT INDEX(content),
+KEY(day)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `year` int(10) unsigned DEFAULT NULL,
+  `month` int(10) unsigned DEFAULT NULL,
+  `day` int(10) unsigned DEFAULT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  PRIMARY KEY (`id`),
+  KEY `day` (`day`),
+  FULLTEXT KEY `content` (`content`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日�ら������。");
+INSERT INTO diaries VALUES(2, 2011, 11, 10, "天気", "明日�富士山�天気����");
+INSERT INTO diaries VALUES(3, 2011, 11, 11, "富士山", "今日も天気�よ���れ��見�る。");
+INSERT INTO diaries VALUES(4, 2011, 11, 11, "帰り�", "今日�天気�よ��よ���。");
+INSERT INTO diaries VALUES(5, 2011, 12, 1, "久��り", "天気�悪��ら���留守番。");
+INSERT INTO diaries VALUES(6, 2011, 12, 2, "�雪", "今日�天気�雪�");
+SELECT SQL_CALC_FOUND_ROWS * FROM diaries WHERE MATCH(content) AGAINST("今日 天気" IN BOOLEAN MODE) ORDER BY day LIMIT 0,5;
+id	year	month	day	title	content
[phone]	久��り	天気�悪��ら���留守番。
[phone]	�雪	今日�天気�雪�
[phone]	Hello	今日�ら������。
[phone]	天気	明日�富士山�天気����
[phone]	富士山	今日も天気�よ���れ��見�る。
+SELECT FOUND_ROWS();
+FOUND_ROWS()
+6
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_index_recreate.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_index_recreate.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_index_recreate.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,41 @@
+drop table if exists diaries;
+set names utf8;
+create table diaries (
+id int primary key,
+title varchar(255),
+content text,
+fulltext index (title)
+) default charset utf8;
+show create table diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title` (`title`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into diaries values(1, "Hello", "������。");
+insert into diaries values(2, "天気", "明日�富士山�天気����");
+insert into diaries values(3, "富士山", "今日も�れ�。");
+select * from diaries where match(title) against("富士山");
+id	title	content
+3	富士山	今日も�れ�。
+drop index title on diaries;
+select * from diaries where match(title) against("富士山");
+ERROR HY000: Can't find FULLTEXT index matching the column list
+select * from diaries;
+id	title	content
+1	Hello	������。
+2	天気	明日�富士山�天気����
+3	富士山	今日も�れ�。
+create fulltext index new_title_index on diaries (title);
+select * from diaries where match(title) against("富士山");
+id	title	content
+3	富士山	今日も�れ�。
+select * from diaries;
+id	title	content
+1	Hello	������。
+2	天気	明日�富士山�天気����
+3	富士山	今日も�れ�。
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_insert_select.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_insert_select.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_insert_select.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,66 @@
+drop table if exists t1, t2, t3;
+create table t1 (c1 int primary key, c2 varchar(100), fulltext index(c2)) default charset utf8;
+create table t2 (c1 int primary key, c2 text, fulltext index(c2)) default charset utf8;
+insert into t1 values (1, "aa ii uu ee oo");
+insert into t1 values (2, "ka ki ku ke ko");
+insert into t1 values (3, "aa ii ii ii oo");
+insert into t1 values (4, "sa si su se so");
+insert into t1 values (5, "ta ti ii ii to");
+insert into t2 (c1,c2) select c1,c2 from t1;
+select * from t1;
+c1	c2
+1	aa ii uu ee oo
+2	ka ki ku ke ko
+3	aa ii ii ii oo
+4	sa si su se so
+5	ta ti ii ii to
+select * from t2;
+c1	c2
+1	aa ii uu ee oo
+2	ka ki ku ke ko
+3	aa ii ii ii oo
+4	sa si su se so
+5	ta ti ii ii to
+select * from t1 where c1=3;
+c1	c2
+3	aa ii ii ii oo
+select * from t2 where c1=3;
+c1	c2
+3	aa ii ii ii oo
+select * from t1 where c1>3 order by c1 desc;
+c1	c2
+5	ta ti ii ii to
+4	sa si su se so
+select * from t2 where c1>3 order by c1 asc;
+c1	c2
+4	sa si su se so
+5	ta ti ii ii to
+select * from t1 where c2>"s" order by c2 desc;
+c1	c2
+5	ta ti ii ii to
+4	sa si su se so
+select * from t2 where c2>"s" order by c1 asc;
+c1	c2
+4	sa si su se so
+5	ta ti ii ii to
+select * from t1 where match(c2) against("ii") order by match(c2) against("ii") desc;
+c1	c2
+3	aa ii ii ii oo
+5	ta ti ii ii to
+1	aa ii uu ee oo
+select * from t2 where match(c2) against("ii") order by match(c2) against("ii") asc;
+c1	c2
+1	aa ii uu ee oo
+5	ta ti ii ii to
+3	aa ii ii ii oo
+select c1,c2,match(c2) against("ii") from t1 where match(c2) against("ii");
+c1	c2	match(c2) against("ii")
+1	aa ii uu ee oo	174763
+3	aa ii ii ii oo	524289
+5	ta ti ii ii to	349526
+select c1,c2,match(c2) against("ii") from t2 where match(c2) against("ii");
+c1	c2	match(c2) against("ii")
+1	aa ii uu ee oo	174763
+3	aa ii ii ii oo	524289
+5	ta ti ii ii to	349526
+drop table t1,t2;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_insert_values.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_insert_values.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_insert_values.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,25 @@
+drop table if exists t1, t2, t3;
+create table t1 (c1 int primary key, c2 text, fulltext index ft (c2));
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) NOT NULL,
+  `c2` text,
+  PRIMARY KEY (`c1`),
+  FULLTEXT KEY `ft` (`c2`)
+) ENGINE=mroonga DEFAULT CHARSET=latin1
+insert into t1 values (1, "hoge hoge");
+insert into t1 values (2, "fuga fuga");
+insert into t1 values (3, "moge moge");
+select * from t1;
+c1	c2
+1	hoge hoge
+2	fuga fuga
+3	moge moge
+flush tables;
+select * from t1;
+c1	c2
+1	hoge hoge
+2	fuga fuga
+3	moge moge
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_multiple_column_index_delete.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_multiple_column_index_delete.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_multiple_column_index_delete.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,34 @@
+drop table if exists diaries;
+set names utf8;
+create table diaries (
+id int primary key,
+title varchar(255),
+content text,
+fulltext index (title, content),
+fulltext index (title),
+fulltext index (content)
+) default charset utf8;
+show create table diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title` (`title`,`content`),
+  FULLTEXT KEY `title_2` (`title`),
+  FULLTEXT KEY `content` (`content`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into diaries values(1, "Hello", "������。");
+insert into diaries values(2, "天気", "明日�富士山�天気����");
+insert into diaries values(3, "富士山", "今日も�れ�。");
+delete from diaries where id = 2;
+select * from diaries where match(title, content) against("富士山");
+id	title	content
+3	富士山	今日も�れ�。
+select * from diaries where match(title) against("富士山");
+id	title	content
+3	富士山	今日も�れ�。
+select * from diaries where match(content) against("富士山");
+id	title	content
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_multiple_column_index_insert.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_multiple_column_index_insert.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_multiple_column_index_insert.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,40 @@
+drop table if exists diaries;
+set names utf8;
+create table diaries (
+id int primary key,
+title varchar(255),
+content text,
+fulltext index (title, content),
+fulltext index (title),
+fulltext index (content)
+) default charset utf8;
+show create table diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title` (`title`,`content`),
+  FULLTEXT KEY `title_2` (`title`),
+  FULLTEXT KEY `content` (`content`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into diaries values(1, "Hello", "������。");
+insert into diaries values(2, "天気", "明日�富士山�天気����");
+insert into diaries values(3, "富士山", "今日も�れ�。");
+select * from diaries;
+id	title	content
+1	Hello	������。
+2	天気	明日�富士山�天気����
+3	富士山	今日も�れ�。
+select * from diaries where match(title, content) against("富士山");
+id	title	content
+2	天気	明日�富士山�天気����
+3	富士山	今日も�れ�。
+select * from diaries where match(title) against("富士山");
+id	title	content
+3	富士山	今日も�れ�。
+select * from diaries where match(content) against("富士山");
+id	title	content
+2	天気	明日�富士山�天気����
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_multiple_column_index_recreate.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_multiple_column_index_recreate.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_multiple_column_index_recreate.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,42 @@
+drop table if exists diaries;
+set names utf8;
+create table diaries (
+id int primary key,
+title varchar(255),
+content text,
+fulltext index (title, content),
+fulltext index (title),
+fulltext index (content)
+) default charset utf8;
+show create table diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title` (`title`,`content`),
+  FULLTEXT KEY `title_2` (`title`),
+  FULLTEXT KEY `content` (`content`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into diaries values(1, "Hello", "������。");
+insert into diaries values(2, "天気", "明日�富士山�天気����");
+insert into diaries values(3, "富士山", "今日も�れ�。");
+select * from diaries where match(title, content) against("富士山");
+id	title	content
+2	天気	明日�富士山�天気����
+3	富士山	今日も�れ�。
+drop index title on diaries;
+select * from diaries where match(title, content) against("富士山");
+ERROR HY000: Can't find FULLTEXT index matching the column list
+create fulltext index new_title_content_index on diaries (title, content);
+select * from diaries where match(title, content) against("富士山");
+id	title	content
+2	天気	明日�富士山�天気����
+3	富士山	今日も�れ�。
+select * from diaries;
+id	title	content
+1	Hello	������。
+2	天気	明日�富士山�天気����
+3	富士山	今日も�れ�。
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_multiple_column_index_update.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_multiple_column_index_update.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_multiple_column_index_update.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,37 @@
+drop table if exists diaries;
+set names utf8;
+create table diaries (
+id int primary key,
+title varchar(255),
+content text,
+fulltext index (title, content),
+fulltext index (title),
+fulltext index (content)
+) default charset utf8;
+show create table diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title` (`title`,`content`),
+  FULLTEXT KEY `title_2` (`title`),
+  FULLTEXT KEY `content` (`content`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into diaries values(1, "Hello", "������。");
+insert into diaries values(2, "天気", "明日�富士山�天気����");
+insert into diaries values(3, "富士山", "今日も�れ�。");
+update diaries set title = "�ョモランマ" where id = 3;
+update diaries set content = "�ョモランマ�富士山" where id = 1;
+select * from diaries where match(title, content) against("富士山");
+id	title	content
+1	Hello	�ョモランマ�富士山
+2	天気	明日�富士山�天気����
+select * from diaries where match(title) against("富士山");
+id	title	content
+select * from diaries where match(content) against("富士山");
+id	title	content
+1	Hello	�ョモランマ�富士山
+2	天気	明日�富士山�天気����
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_multiple_index.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_multiple_index.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_multiple_index.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,33 @@
+drop table if exists diaries;
+create table diaries (
+id int primary key auto_increment,
+title text,
+body text,
+fulltext index title_index (title),
+fulltext index body_index (body)
+) default charset utf8;
+show create table diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `body` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title_index` (`title`),
+  FULLTEXT KEY `body_index` (`body`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into diaries (title, body) values ("survey", "will start groonga!");
+insert into diaries (title, body) values ("groonga (1)", "starting groonga...");
+insert into diaries (title, body) values ("groonga (2)", "started groonga.");
+select * from diaries
+where match(title) against("survey") and
+match(body) against("groonga");
+id	title	body
+1	survey	will start groonga!
+select *, match(title) against("survey"), match(body) against("groonga")
+from diaries
+where match(title) against("survey") and
+match(body) against("groonga");
+id	title	body	match(title) against("survey")	match(body) against("groonga")
+1	survey	will start groonga!	1048577	149797
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_no_primary_key.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_no_primary_key.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_no_primary_key.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS diaries;
+SET NAMES UTF8;
+CREATE TABLE diaries (
+title VARCHAR(255),
+content TEXT,
+FULLTEXT INDEX (content)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  FULLTEXT KEY `content` (`content`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries VALUES("Hello", "今日�ら������。");
+INSERT INTO diaries VALUES("天気", "明日�富士山�天気����");
+INSERT INTO diaries VALUES("富士山", "今日も天気�よ���れ��見�る。");
+SELECT * FROM diaries WHERE MATCH(content) AGAINST("*D+ 今日 天気" IN BOOLEAN MODE);
+title	content
+富士山	今日も天気�よ���れ��見�る。
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_no_such_key.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_no_such_key.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_no_such_key.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,25 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title TEXT,
+body TEXT,
+FULLTEXT INDEX title_index (title),
+FULLTEXT INDEX body_index (body)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `title` text,
+  `body` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `title_index` (`title`),
+  FULLTEXT KEY `body_index` (`body`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (title, body) VALUES ("survey", "will start groonga!");
+INSERT INTO diaries (title, body) VALUES ("groonga (1)", "starting groonga...");
+INSERT INTO diaries (title, body) VALUES ("groonga (2)", "started groonga.");
+SELECT * FROM diaries FORCE INDEX(primary)
+WHERE MATCH(title) AGAINST("survey" IN BOOLEAN MODE);
+id	title	body
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_not_match_against.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_not_match_against.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_not_match_against.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,68 @@
+drop table if exists t1, t2, t3;
+create table t1 (c1 int primary key, c2 int, c3 text, fulltext index ft(c3));
+insert into t1 values(1,10,"aa ii uu ee oo");
+insert into t1 values(2,10,"ka ki ku ke ko");
+insert into t1 values(3,10,"aa ii uu ee oo");
+insert into t1 values(4,10,"ka ki ku ke ko");
+insert into t1 values(5,20,"aa ii uu ee oo");
+insert into t1 values(6,20,"ka ki ku ke ko");
+insert into t1 values(7,20,"aa ii uu ee oo");
+insert into t1 values(8,20,"ka ki ku ke ko");
+select * from t1;
+c1	c2	c3
+1	10	aa ii uu ee oo
+2	10	ka ki ku ke ko
+3	10	aa ii uu ee oo
+4	10	ka ki ku ke ko
+5	20	aa ii uu ee oo
+6	20	ka ki ku ke ko
+7	20	aa ii uu ee oo
+8	20	ka ki ku ke ko
+select * from t1 where match(c3) against("uu");
+c1	c2	c3
+1	10	aa ii uu ee oo
+3	10	aa ii uu ee oo
+5	20	aa ii uu ee oo
+7	20	aa ii uu ee oo
+select * from t1 where not match(c3) against("uu");
+c1	c2	c3
+2	10	ka ki ku ke ko
+4	10	ka ki ku ke ko
+6	20	ka ki ku ke ko
+8	20	ka ki ku ke ko
+select * from t1 where match(c3) against("dummy");
+c1	c2	c3
+select * from t1 where not match(c3) against("dummy");
+c1	c2	c3
+1	10	aa ii uu ee oo
+2	10	ka ki ku ke ko
+3	10	aa ii uu ee oo
+4	10	ka ki ku ke ko
+5	20	aa ii uu ee oo
+6	20	ka ki ku ke ko
+7	20	aa ii uu ee oo
+8	20	ka ki ku ke ko
+select * from t1 where c1 = 4 and not match(c3) against("uu");
+c1	c2	c3
+4	10	ka ki ku ke ko
+select * from t1 where c1 <= 4 and not match(c3) against("uu");
+c1	c2	c3
+2	10	ka ki ku ke ko
+4	10	ka ki ku ke ko
+select * from t1 where c1 > 4 and not match(c3) against("uu");
+c1	c2	c3
+6	20	ka ki ku ke ko
+8	20	ka ki ku ke ko
+select * from t1 where c2 = 10 and not match(c3) against("uu");
+c1	c2	c3
+2	10	ka ki ku ke ko
+4	10	ka ki ku ke ko
+select * from t1 where c2 >= 15 and not match(c3) against("uu");
+c1	c2	c3
+6	20	ka ki ku ke ko
+8	20	ka ki ku ke ko
+select * from t1 where c2 < 15 and not match(c3) against("uu");
+c1	c2	c3
+2	10	ka ki ku ke ko
+4	10	ka ki ku ke ko
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_parser_comment.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_parser_comment.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_parser_comment.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,29 @@
+drop table if exists diaries;
+create table diaries (
+id int primary key auto_increment,
+body text,
+fulltext index body_index (body)
+comment 'parser "TokenBigramSplitSymbolAlphaDigit"'
+) default charset utf8;
+show create table diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `body` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `body_index` (`body`) COMMENT 'parser "TokenBigramSplitSymbolAlphaDigit"'
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into diaries (body) values ("will start groonga!");
+insert into diaries (body) values ("starting groonga...");
+insert into diaries (body) values ("started groonga.");
+select * from diaries;
+id	body
+1	will start groonga!
+2	starting groonga...
+3	started groonga.
+select * from diaries where match(body) against("start");
+id	body
+1	will start groonga!
+2	starting groonga...
+3	started groonga.
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_parser_default.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_parser_default.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_parser_default.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,31 @@
+drop table if exists diaries;
+set global mroonga_default_parser=TokenBigramSplitSymbolAlphaDigit;
+create table diaries (
+id int primary key auto_increment,
+body text,
+fulltext index body_index (body)
+) default charset utf8;
+show create table diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `body` text,
+  PRIMARY KEY (`id`),
+  FULLTEXT KEY `body_index` (`body`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into diaries (body) values ("will start groonga!");
+insert into diaries (body) values ("starting groonga...");
+insert into diaries (body) values ("started groonga.");
+insert into diaries (body) values ("finished groonga.");
+select * from diaries;
+id	body
+1	will start groonga!
+2	starting groonga...
+3	started groonga.
+4	finished groonga.
+select * from diaries where match(body) against("start");
+id	body
+1	will start groonga!
+2	starting groonga...
+3	started groonga.
+drop table diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_search_ascii.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_search_ascii.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_search_ascii.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,29 @@
+drop table if exists t1, t2, t3;
+create table t1 (c1 int primary key, c2 int, c3 text, fulltext index ft(c3));
+insert into t1 values(1,10,"aa ii uu ee oo");
+insert into t1 values(2,20,"ka ki ku ke ko");
+insert into t1 values(3,30,"sa si su se so");
+insert into t1 values(4,40,"ta ti tu te to");
+insert into t1 values(5,50,"aa ii uu ee oo");
+select * from t1;
+c1	c2	c3
+1	10	aa ii uu ee oo
+2	20	ka ki ku ke ko
+3	30	sa si su se so
+4	40	ta ti tu te to
+5	50	aa ii uu ee oo
+select * from t1 where match(c3) against("su");
+c1	c2	c3
+3	30	sa si su se so
+select * from t1 where match(c3) against("ii");
+c1	c2	c3
+1	10	aa ii uu ee oo
+5	50	aa ii uu ee oo
+select * from t1 where match(c3) against("+su" in boolean mode);
+c1	c2	c3
+3	30	sa si su se so
+select * from t1 where match(c3) against("+ii" in boolean mode);
+c1	c2	c3
+1	10	aa ii uu ee oo
+5	50	aa ii uu ee oo
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_search_cp932.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_search_cp932.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_search_cp932.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,18 @@
+drop table if exists t1, t2, t3;
+set names cp932;
+create table t1 (c1 int primary key, c2 varchar(255), c3 text, fulltext index(c2), fulltext index(c3)) default charset cp932;
+insert into t1 values(1, "–¾“ú‚Ì•xŽmŽR‚Ì“V‹C‚ɂ‚¢‚Ä","‚ ‚ ‚ ‚ ‚ ‚ ‚ ");
+insert into t1 values(2, "‚¢‚¢‚¢‚¢‚¢","–¾“ú‚Ì•xŽmŽR‚Ì“V‹C‚Í•ª‚©‚è‚Ü‚¹‚ñ");
+insert into t1 values(3, "dummy", "dummy");
+select * from t1;
+c1	c2	c3
+1	–¾“ú‚Ì•xŽmŽR‚Ì“V‹C‚ɂ‚¢‚Ä	‚ ‚ ‚ ‚ ‚ ‚ ‚ 
+2	‚¢‚¢‚¢‚¢‚¢	–¾“ú‚Ì•xŽmŽR‚Ì“V‹C‚Í•ª‚©‚è‚Ü‚¹‚ñ
+3	dummy	dummy
+select * from t1 where match(c2) against("•xŽmŽR");
+c1	c2	c3
+1	–¾“ú‚Ì•xŽmŽR‚Ì“V‹C‚ɂ‚¢‚Ä	‚ ‚ ‚ ‚ ‚ ‚ ‚ 
+select * from t1 where match(c3) against("•xŽmŽR");
+c1	c2	c3
+2	‚¢‚¢‚¢‚¢‚¢	–¾“ú‚Ì•xŽmŽR‚Ì“V‹C‚Í•ª‚©‚è‚Ü‚¹‚ñ
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_search_eucjpms.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_search_eucjpms.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_search_eucjpms.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,18 @@
+drop table if exists t1, t2, t3;
+set names eucjpms;
+create table t1 (c1 int primary key, c2 varchar(255), c3 text, fulltext index(c2), fulltext index(c3)) default charset eucjpms;
+insert into t1 values(1, "ÌÀÆü¤ÎÉٻ볤ÎÅ·µ¤¤Ë¤Ä¤¤¤Æ","¤¢¤¢¤¢¤¢¤¢¤¢¤¢");
+insert into t1 values(2, "¤¤¤¤¤¤¤¤¤¤","ÌÀÆü¤ÎÉٻ볤ÎÅ·µ¤¤Ïʬ¤«¤ê¤Þ¤»¤ó");
+insert into t1 values(3, "dummy", "dummy");
+select * from t1;
+c1	c2	c3
+1	ÌÀÆü¤ÎÉٻ볤ÎÅ·µ¤¤Ë¤Ä¤¤¤Æ	¤¢¤¢¤¢¤¢¤¢¤¢¤¢
+2	¤¤¤¤¤¤¤¤¤¤	ÌÀÆü¤ÎÉٻ볤ÎÅ·µ¤¤Ïʬ¤«¤ê¤Þ¤»¤ó
+3	dummy	dummy
+select * from t1 where match(c2) against("Éٻλ³");
+c1	c2	c3
+1	ÌÀÆü¤ÎÉٻ볤ÎÅ·µ¤¤Ë¤Ä¤¤¤Æ	¤¢¤¢¤¢¤¢¤¢¤¢¤¢
+select * from t1 where match(c3) against("Éٻλ³");
+c1	c2	c3
+2	¤¤¤¤¤¤¤¤¤¤	ÌÀÆü¤ÎÉٻ볤ÎÅ·µ¤¤Ïʬ¤«¤ê¤Þ¤»¤ó
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/fulltext_search_japanese.result'
--- mysql-test/suite/mroonga_storage/r/fulltext_search_japanese.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/fulltext_search_japanese.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,18 @@
+drop table if exists t1, t2, t3;
+set names utf8;
+create table t1 (c1 int primary key, c2 varchar(255), c3 text, fulltext index(c2), fulltext index(c3)) default charset utf8;
+insert into t1 values(1, "明日�富士山�天気����","�������");
+insert into t1 values(2, "�����","明日�富士山�天気�分�り��ん");
+insert into t1 values(3, "dummy", "dummy");
+select * from t1;
+c1	c2	c3
+1	明日�富士山�天気����	�������
+2	�����	明日�富士山�天気�分�り��ん
+3	dummy	dummy
+select * from t1 where match(c2) against("富士山");
+c1	c2	c3
+1	明日�富士山�天気����	�������
+select * from t1 where match(c3) against("富士山");
+c1	c2	c3
+2	�����	明日�富士山�天気�分�り��ん
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/geometry_contains.result'
--- mysql-test/suite/mroonga_storage/r/geometry_contains.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/geometry_contains.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,169 @@
+drop table if exists shops;
+create table shops (
+id int primary key auto_increment,
+name text,
+location geometry NOT NULL,
+spatial key location_index (location)
+);
+show create table shops;
+Table	Create Table
+shops	CREATE TABLE `shops` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` text,
+  `location` geometry NOT NULL,
+  PRIMARY KEY (`id`),
+  SPATIAL KEY `location_index` (`location`)
+) ENGINE=mroonga DEFAULT CHARSET=latin1
+insert into shops (name, location)
+values ('nezu-no-taiyaki',
+GeomFromText('POINT(139.762573 35.720253)'));
+insert into shops (name, location)
+values ('taiyaki-kataoka',
+GeomFromText('POINT(139.715591 35.712521)'));
+insert into shops (name, location)
+values ('soba-taiyaki-ku',
+GeomFromText('POINT(139.659088 35.683712)'));
+insert into shops (name, location)
+values ('kuruma',
+GeomFromText('POINT(139.706207 35.721516)'));
+insert into shops (name, location)
+values ('hirose-ya',
+GeomFromText('POINT(139.685608 35.714844)'));
+insert into shops (name, location)
+values ('sazare',
+GeomFromText('POINT(139.685043 35.714653)'));
+insert into shops (name, location)
+values ('omede-taiyaki',
+GeomFromText('POINT(139.817154 35.700516)'));
+insert into shops (name, location)
+values ('onaga-ya',
+GeomFromText('POINT(139.81105 35.698254)'));
+insert into shops (name, location)
+values ('shiro-ya',
+GeomFromText('POINT(139.638611 35.705517)'));
+insert into shops (name, location)
+values ('fuji-ya',
+GeomFromText('POINT(139.637115 35.703938)'));
+insert into shops (name, location)
+values ('miyoshi',
+GeomFromText('POINT(139.537323 35.644539)'));
+insert into shops (name, location)
+values ('juju-ya',
+GeomFromText('POINT(139.695755 35.628922)'));
+insert into shops (name, location)
+values ('tatsumi-ya',
+GeomFromText('POINT(139.638657 35.665501)'));
+insert into shops (name, location)
+values ('tetsuji',
+GeomFromText('POINT(139.76857 35.680912)'));
+insert into shops (name, location)
+values ('gazuma-ya',
+GeomFromText('POINT(139.647598 35.700817)'));
+insert into shops (name, location)
+values ('honma-mon',
+GeomFromText('POINT(139.652573 35.722736)'));
+insert into shops (name, location)
+values ('naniwa-ya',
+GeomFromText('POINT(139.796234 35.730061)'));
+insert into shops (name, location)
+values ('kuro-dai',
+GeomFromText('POINT(139.704834 35.650345)'));
+insert into shops (name, location)
+values ('daruma',
+GeomFromText('POINT(139.770599 35.681461)'));
+insert into shops (name, location)
+values ('yanagi-ya',
+GeomFromText('POINT(139.783981 35.685341)'));
+insert into shops (name, location)
+values ('sharaku',
+GeomFromText('POINT(139.794846 35.716969)'));
+insert into shops (name, location)
+values ('takane',
+GeomFromText('POINT(139.560913 35.698601)'));
+insert into shops (name, location)
+values ('chiyoda',
+GeomFromText('POINT(139.652817 35.642601)'));
+insert into shops (name, location)
+values ('da-ka-po',
+GeomFromText('POINT(139.727356 35.627346)'));
+insert into shops (name, location)
+values ('matsushima-ya',
+GeomFromText('POINT(139.737381 35.640556)'));
+insert into shops (name, location)
+values ('kazuya',
+GeomFromText('POINT(139.760895 35.673508)'));
+insert into shops (name, location)
+values ('furuya-kogane-an',
+GeomFromText('POINT(139.676071 35.680603)'));
+insert into shops (name, location)
+values ('hachi-no-ie',
+GeomFromText('POINT(139.668106 35.608021)'));
+insert into shops (name, location)
+values ('azuki-chan',
+GeomFromText('POINT(139.673203 35.64151)'));
+insert into shops (name, location)
+values ('kuriko-an',
+GeomFromText('POINT(139.796829 35.712013)'));
+insert into shops (name, location)
+values ('yume-no-aru-machi-no-taiyaki-ya-san',
+GeomFromText('POINT(139.712524 35.616199)'));
+insert into shops (name, location)
+values ('naze-ya',
+GeomFromText('POINT(139.665833 35.609039)'));
+insert into shops (name, location)
+values ('sanoki-ya',
+GeomFromText('POINT(139.770721 35.66592)'));
+insert into shops (name, location)
+values ('shigeta',
+GeomFromText('POINT(139.780273 35.672626)'));
+insert into shops (name, location)
+values ('nishimi-ya',
+GeomFromText('POINT(139.774628 35.671825)'));
+insert into shops (name, location)
+values ('hiiragi',
+GeomFromText('POINT(139.711517 35.647701)'));
+select id, name, AsText(location) as location_text from shops;
+id	name	location_text
+1	nezu-no-taiyaki	POINT(139.762573055556 35.7202530555556)
+2	taiyaki-kataoka	POINT(139.715591111111 35.7125211111111)
+3	soba-taiyaki-ku	POINT(139.659088055556 35.6837119444444)
+4	kuruma	POINT(139.706206944444 35.7215161111111)
+5	hirose-ya	POINT(139.685608055556 35.7148438888889)
+6	sazare	POINT(139.685043055556 35.7146530555556)
+7	omede-taiyaki	POINT(139.817153888889 35.7005161111111)
+8	onaga-ya	POINT(139.81105 35.6982538888889)
+9	shiro-ya	POINT(139.638611111111 35.7055169444444)
+10	fuji-ya	POINT(139.637115 35.7039380555556)
+11	miyoshi	POINT(139.537323055556 35.6445388888889)
+12	juju-ya	POINT(139.695755 35.6289219444444)
+13	tatsumi-ya	POINT(139.638656944444 35.6655011111111)
+14	tetsuji	POINT(139.76857 35.6809119444444)
+15	gazuma-ya	POINT(139.647598055556 35.7008169444444)
+16	honma-mon	POINT(139.652573055556 35.7227361111111)
+17	naniwa-ya	POINT(139.796233888889 35.7300611111111)
+18	kuro-dai	POINT(139.704833888889 35.650345)
+19	daruma	POINT(139.770598888889 35.6814611111111)
+20	yanagi-ya	POINT(139.783981111111 35.6853411111111)
+21	sharaku	POINT(139.794846111111 35.7169688888889)
+22	takane	POINT(139.560913055556 35.6986011111111)
+23	chiyoda	POINT(139.652816944444 35.6426011111111)
+24	da-ka-po	POINT(139.727356111111 35.6273461111111)
+25	matsushima-ya	POINT(139.737381111111 35.6405561111111)
+26	kazuya	POINT(139.760895 35.6735080555556)
+27	furuya-kogane-an	POINT(139.676071111111 35.6806030555556)
+28	hachi-no-ie	POINT(139.668106111111 35.6080211111111)
+29	azuki-chan	POINT(139.673203055556 35.64151)
+30	kuriko-an	POINT(139.796828888889 35.7120130555556)
+31	yume-no-aru-machi-no-taiyaki-ya-san	POINT(139.712523888889 35.6161988888889)
+32	naze-ya	POINT(139.665833055556 35.6090388888889)
+33	sanoki-ya	POINT(139.770721111111 35.66592)
+34	shigeta	POINT(139.780273055556 35.6726261111111)
+35	nishimi-ya	POINT(139.774628055556 35.671825)
+36	hiiragi	POINT(139.711516944444 35.6477011111111)
+select id, name, AsText(location) as location_text from shops
+where MBRContains(GeomFromText('LineString(139.7727 35.6684, 139.7038 35.7121)'), location);
+id	name	location_text
+14	tetsuji	POINT(139.76857 35.6809119444444)
+19	daruma	POINT(139.770598888889 35.6814611111111)
+26	kazuya	POINT(139.760895 35.6735080555556)
+drop table shops;
 
=== added file 'mysql-test/suite/mroonga_storage/r/hash_index_id_normal.result'
--- mysql-test/suite/mroonga_storage/r/hash_index_id_normal.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/hash_index_id_normal.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,18 @@
+drop table if exists t1, t2, t3;
+create table t1 (_id int, a int, key (_id) using hash);
+insert into t1 values(null, 100);
+insert into t1 values(null, 100);
+insert into t1 values(null, 100);
+insert into t1 values(null, 100);
+select * from t1;
+_id	a
+1	100
+2	100
+3	100
+4	100
+select * from t1 where _id = 2;
+_id	a
+2	100
+select * from t1 where _id = 20;
+_id	a
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/hash_index_id_primary.result'
--- mysql-test/suite/mroonga_storage/r/hash_index_id_primary.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/hash_index_id_primary.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,28 @@
+drop table if exists t1, t2, t3;
+create table t1 (_id int, a int, primary key (_id) using hash);
+insert into t1 values(null, 100);
+ERROR 23000: Column '_id' cannot be null
+insert into t1 values(1,100);
+Warnings:
+Warning	1265	data truncated for _id column
+insert into t1 values(1,100);
+Warnings:
+Warning	1265	data truncated for _id column
+insert into t1 values(1,100);
+Warnings:
+Warning	1265	data truncated for _id column
+insert into t1 values(1,100);
+Warnings:
+Warning	1265	data truncated for _id column
+select * from t1;
+_id	a
+1	100
+2	100
+3	100
+4	100
+select * from t1 where _id = 2;
+_id	a
+2	100
+select * from t1 where _id = 20;
+_id	a
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/hash_index_id_unique.result'
--- mysql-test/suite/mroonga_storage/r/hash_index_id_unique.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/hash_index_id_unique.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,18 @@
+drop table if exists t1, t2, t3;
+create table t1 (_id int, a int, unique key (_id) using hash);
+insert into t1 values(null, 100);
+insert into t1 values(null, 100);
+insert into t1 values(null, 100);
+insert into t1 values(null, 100);
+select * from t1;
+_id	a
+1	100
+2	100
+3	100
+4	100
+select * from t1 where _id = 2;
+_id	a
+2	100
+select * from t1 where _id = 20;
+_id	a
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/hash_index_normal_column_insert.result'
--- mysql-test/suite/mroonga_storage/r/hash_index_normal_column_insert.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/hash_index_normal_column_insert.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,25 @@
+drop table if exists t1, t2, t3;
+create table t1 (c1 int primary key, c2 int, index using hash (c2));
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `c1` int(11) NOT NULL,
+  `c2` int(11) DEFAULT NULL,
+  PRIMARY KEY (`c1`),
+  KEY `c2` (`c2`) USING HASH
+) ENGINE=mroonga DEFAULT CHARSET=latin1
+insert into t1 values (1, 100);
+insert into t1 values (2, 101);
+insert into t1 values (3, 102);
+select * from t1;
+c1	c2
+1	100
+2	101
+3	102
+flush tables;
+select * from t1;
+c1	c2
+1	100
+2	101
+3	102
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/information_schema.result'
--- mysql-test/suite/mroonga_storage/r/information_schema.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/information_schema.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,4 @@
+select PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_TYPE
+from information_schema.plugins where plugin_name = "mroonga";
+PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_TYPE
+mroonga	2.2	STORAGE ENGINE
 
=== added file 'mysql-test/suite/mroonga_storage/r/insert.result'
--- mysql-test/suite/mroonga_storage/r/insert.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/insert.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,90 @@
+drop table if exists t1, t2, t3;
+create table t1 (c1 tinyint);
+insert into t1 values(1);
+select * from t1;
+c1
+1
+drop table t1;
+create table t1 (c1 smallint);
+insert into t1 values(1);
+select * from t1;
+c1
+1
+drop table t1;
+create table t1 (c1 mediumint);
+insert into t1 values(1);
+select * from t1;
+c1
+1
+drop table t1;
+create table t1 (c1 int);
+insert into t1 values(1);
+select * from t1;
+c1
+1
+drop table t1;
+create table t1 (c1 bigint);
+insert into t1 values(1);
+select * from t1;
+c1
+1
+drop table t1;
+create table t1 (c1 float);
+insert into t1 values(0.5);
+select * from t1;
+c1
+0.5
+drop table t1;
+create table t1 (c1 double);
+insert into t1 values(0.5);
+select * from t1;
+c1
+0.5
+drop table t1;
+create table t1 (c1 date);
+insert into t1 values("2010/03/26");
+select * from t1;
+c1
[phone]
+drop table t1;
+create table t1 (c1 time);
+insert into t1 values("11:22:33");
+select * from t1;
+c1
+11:22:33
+drop table t1;
+create table t1 (c1 year);
+insert into t1 values("2010");
+select * from t1;
+c1
+2010
+drop table t1;
+create table t1 (c1 datetime);
+insert into t1 values("2010/03/26 11:22:33");
+select * from t1;
+c1
[phone]:22:33
+drop table t1;
+create table t1 (c1 int, _id int);
+set sql_mode="";
+insert into t1 (c1,_id) values (1,1);
+Warnings:
+Warning	1265	data truncated for _id column
+set sql_mode="strict_all_tables";
+insert into t1 (c1,_id) values (4,1);
+ERROR 22001: cannot insert value to _id column
+select * from t1;
+c1	_id
+1	1
+drop table t1;
+create table t1 (c1 int primary key, c2 int);
+insert into t1 values(1,100);
+select * from t1;
+c1	c2
+1	100
+insert into t1 values(1,200);
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+select * from t1;
+c1	c2
+1	100
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/insert_on_duplicate_key_update_primary_key.result'
--- mysql-test/suite/mroonga_storage/r/insert_on_duplicate_key_update_primary_key.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/insert_on_duplicate_key_update_primary_key.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,26 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+day DATE PRIMARY KEY,
+title TEXT
+) DEFAULT CHARSET=UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `day` date NOT NULL,
+  `title` text,
+  PRIMARY KEY (`day`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (day, title)
+VALUES ("2012-02-14", "clear day")
+ON DUPLICATE KEY UPDATE title = "clear day (duplicated)";
+INSERT INTO diaries (day, title)
+VALUES ("2012-02-14", "rainy day")
+ON DUPLICATE KEY UPDATE title = "rainy day (duplicated)";
+INSERT INTO diaries (day, title)
+VALUES ("2012-02-15", "cloudy day")
+ON DUPLICATE KEY UPDATE title = "cloudy day (duplicated)";
+SELECT * FROM diaries;
+day	title
[phone]	rainy day (duplicated)
[phone]	cloudy day
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/insert_on_duplicate_key_update_unique_key.result'
--- mysql-test/suite/mroonga_storage/r/insert_on_duplicate_key_update_unique_key.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/insert_on_duplicate_key_update_unique_key.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,30 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+day DATE,
+title TEXT,
+UNIQUE KEY day (day)
+) DEFAULT CHARSET=UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `day` date DEFAULT NULL,
+  `title` text,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `day` (`day`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (day, title)
+VALUES ("2012-02-14", "clear day")
+ON DUPLICATE KEY UPDATE title = "clear day (duplicated)";
+INSERT INTO diaries (day, title)
+VALUES ("2012-02-14", "rainy day")
+ON DUPLICATE KEY UPDATE title = "rainy day (duplicated)";
+INSERT INTO diaries (day, title)
+VALUES ("2012-02-15", "cloudy day")
+ON DUPLICATE KEY UPDATE title = "cloudy day (duplicated)";
+SELECT * FROM diaries;
+id	day	title
[phone]	rainy day (duplicated)
[phone]	cloudy day
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/key_read.result'
--- mysql-test/suite/mroonga_storage/r/key_read.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/key_read.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,53 @@
+drop table if exists t1;
+create table t1 (c1 int, c2 int, c3 int, primary key(c1), key idx1(c2), key idx2(c3, c2));
+insert into t1 values(1,2,4);
+insert into t1 select c1 + 1, c2 + 2, c3 + 4 from t1;
+insert into t1 select c1 + 2, c2 + 4, c3 + 8 from t1;
+insert into t1 select c1 + 4, c2 + 8, c3 + 16 from t1;
+insert into t1 select c1 + 8, c2 + 16, c3 + 32 from t1;
+insert into t1 select c1 + 16, c2 + 32, c3 + 64 from t1;
+select c1 from t1 where c1 between 10 and 16;
+c1
+10
+11
+12
+13
+14
+15
+16
+select c2 from t1 where c2 between 10 and 16;
+c2
+10
+12
+14
+16
+select c2, c3 from t1 where c3 between 10 and 16;
+c2	c3
+6	12
+drop table t1;
+create table t1 (c1 varchar(10), c2 varchar(10), c3 varchar(10), primary key(c1), key idx1(c2), key idx2(c3, c2));
+insert into t1 values('1','2','4');
+insert into t1 select c1 + 1, c2 + 2, c3 + 4 from t1;
+insert into t1 select c1 + 2, c2 + 4, c3 + 8 from t1;
+insert into t1 select c1 + 4, c2 + 8, c3 + 16 from t1;
+insert into t1 select c1 + 8, c2 + 16, c3 + 32 from t1;
+insert into t1 select c1 + 16, c2 + 32, c3 + 64 from t1;
+select c1 from t1 where c1 between '10' and '16';
+c1
+10
+11
+12
+13
+14
+15
+16
+select c2 from t1 where c2 between '10' and '16';
+c2
+10
+12
+14
+16
+select c2, c3 from t1 where c3 between '10' and '16';
+c2	c3
+6	12
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/last_insert_grn_id.result'
--- mysql-test/suite/mroonga_storage/r/last_insert_grn_id.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/last_insert_grn_id.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,31 @@
+drop table if exists t1, t2, t3;
+drop function if exists last_insert_grn_id;
+create function last_insert_grn_id returns integer soname 'ha_mroonga.so';
+create table t1 (_id int, c1 int);
+select last_insert_grn_id();
+last_insert_grn_id()
+0
+insert into t1 values(null,100);
+insert into t1 values(null,100);
+select last_insert_grn_id();
+last_insert_grn_id()
+2
+insert into t1 values(null,100);
+insert into t1 values(null,100);
+select last_insert_grn_id();
+last_insert_grn_id()
+4
+insert into t1 values(null,100);
+insert into t1 values(null,100);
+select last_insert_grn_id();
+last_insert_grn_id()
+6
+insert into t1 values(null,100);
+insert into t1 values(null,100);
+select last_insert_grn_id();
+last_insert_grn_id()
+8
+select last_insert_grn_id(1);
+ERROR HY000: Can't initialize function 'last_insert_grn_id'; last_insert_grn_id must not have arguments
+drop table t1;
+drop function last_insert_grn_id;
 
=== added file 'mysql-test/suite/mroonga_storage/r/log_level.result'
--- mysql-test/suite/mroonga_storage/r/log_level.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/log_level.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,47 @@
+show global variables like 'mroonga_log_level';
+Variable_name	Value
+mroonga_log_level	NOTICE
+set global mroonga_log_level=NONE;
+show global variables like 'mroonga_log_level';
+Variable_name	Value
+mroonga_log_level	NONE
+set global mroonga_log_level=EMERG;
+show global variables like 'mroonga_log_level';
+Variable_name	Value
+mroonga_log_level	EMERG
+set global mroonga_log_level=ALERT;
+show global variables like 'mroonga_log_level';
+Variable_name	Value
+mroonga_log_level	ALERT
+set global mroonga_log_level=CRIT;
+show global variables like 'mroonga_log_level';
+Variable_name	Value
+mroonga_log_level	CRIT
+set global mroonga_log_level=ERROR;
+show global variables like 'mroonga_log_level';
+Variable_name	Value
+mroonga_log_level	ERROR
+set global mroonga_log_level=WARNING;
+show global variables like 'mroonga_log_level';
+Variable_name	Value
+mroonga_log_level	WARNING
+set global mroonga_log_level=NOTICE;
+show global variables like 'mroonga_log_level';
+Variable_name	Value
+mroonga_log_level	NOTICE
+set global mroonga_log_level=INFO;
+show global variables like 'mroonga_log_level';
+Variable_name	Value
+mroonga_log_level	INFO
+set global mroonga_log_level=DEBUG;
+show global variables like 'mroonga_log_level';
+Variable_name	Value
+mroonga_log_level	DEBUG
+set global mroonga_log_level=DUMP;
+show global variables like 'mroonga_log_level';
+Variable_name	Value
+mroonga_log_level	DUMP
+set global mroonga_log_level=dummy;
+ERROR 42000: Variable 'log_level' can't be set to the value of 'dummy'
+set session mroonga_log_level=NOTICE;
+ERROR HY000: Variable 'mroonga_log_level' is a GLOBAL variable and should be set with SET GLOBAL
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_index_delete.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_index_delete.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_index_delete.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,32 @@
+drop table if exists listing;
+set names utf8;
+create table scores (
+id int primary key auto_increment not null,
+name char(30) not null,
+score int not null,
+index property (name, score)
+) default charset utf8;
+show create table scores;
+Table	Create Table
+scores	CREATE TABLE `scores` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` char(30) NOT NULL,
+  `score` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `property` (`name`,`score`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into scores (name, score) values("Taro Yamada", 29);
+insert into scores (name, score) values("Taro Yamada", -12);
+insert into scores (name, score) values("Jiro Yamada", 27);
+insert into scores (name, score) values("Taro Yamada", 10);
+select * from scores;
+id	name	score
+1	Taro Yamada	29
+2	Taro Yamada	-12
+3	Jiro Yamada	27
+4	Taro Yamada	10
+delete from scores where name = "Taro Yamada" and score = 10;
+select * from scores where name = "Taro Yamada" and (score >= -12 and score < 29);
+id	name	score
+2	Taro Yamada	-12
+drop table scores;
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_index_recreate.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_index_recreate.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_index_recreate.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,39 @@
+drop table if exists listing;
+set names utf8;
+create table listing (
+id int primary key auto_increment not null,
+last_name char(30) not null,
+first_name char(30) not null,
+index name (last_name, first_name)
+) default charset utf8;
+show create table listing;
+Table	Create Table
+listing	CREATE TABLE `listing` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `last_name` char(30) NOT NULL,
+  `first_name` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `name` (`last_name`,`first_name`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into listing (last_name, first_name) values("Taro", "Yamada");
+insert into listing (last_name, first_name) values("Taro", "Suzuki");
+insert into listing (last_name, first_name) values("Jiro", "Yamada");
+insert into listing (last_name, first_name) values("Taro", "Tanaka");
+select * from listing
+where last_name = "Taro" and (first_name >= "S" and first_name <= "Y");
+id	last_name	first_name
+2	Taro	Suzuki
+4	Taro	Tanaka
+drop index name on listing;
+select * from listing
+where last_name = "Taro" and (first_name >= "S" and first_name <= "Y");
+id	last_name	first_name
+2	Taro	Suzuki
+4	Taro	Tanaka
+create index new_name_index on listing (last_name, first_name);
+select * from listing
+where last_name = "Taro" and (first_name >= "S" and first_name <= "Y");
+id	last_name	first_name
+2	Taro	Suzuki
+4	Taro	Tanaka
+drop table listing;
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_index_replace.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_index_replace.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_index_replace.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,39 @@
+DROP TABLE IF EXISTS listing;
+CREATE TABLE scores (
+id INT PRIMARY KEY AUTO_INCREMENT NOT NULL,
+name CHAR(30) NOT NULL,
+score INT NOT NULL,
+INDEX property (NAME, SCORE)
+) DEFAULT CHARSET=UTF8;
+SHOW CREATE TABLE scores;
+Table	Create Table
+scores	CREATE TABLE `scores` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` char(30) NOT NULL,
+  `score` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `property` (`name`,`score`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO scores (name, score) VALUES("Taro Yamada", 29);
+INSERT INTO scores (name, score) VALUES("Taro Yamada", -12);
+INSERT INTO scores (name, score) VALUES("Jiro Yamada", 27);
+INSERT INTO scores (name, score) VALUES("Taro Yamada", 10);
+SELECT * FROM scores;
+id	name	score
+1	Taro Yamada	29
+2	Taro Yamada	-12
+3	Jiro Yamada	27
+4	Taro Yamada	10
+REPLACE scores (id, name, score) VALUES (3, "Taro Yamada", 28);
+SELECT * FROM scores;
+id	name	score
+1	Taro Yamada	29
+2	Taro Yamada	-12
+3	Taro Yamada	28
+4	Taro Yamada	10
+SELECT * FROM scores WHERE name = "Taro Yamada" AND (score >= -12 AND score < 29);
+id	name	score
+2	Taro Yamada	-12
+4	Taro Yamada	10
+3	Taro Yamada	28
+DROP TABLE scores;
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_index_select_double.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_index_select_double.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_index_select_double.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,28 @@
+DROP TABLE IF EXISTS temperatures;
+CREATE TABLE temperatures (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title VARCHAR(20),
+temperature DOUBLE,
+KEY temperature_index(temperature),
+KEY multi_index(temperature, title)
+);
+INSERT INTO temperatures VALUES (NULL, "Hot!", 28.2);
+INSERT INTO temperatures VALUES (NULL, "Snow!", -2.8);
+INSERT INTO temperatures VALUES (NULL, "Rainy!", 12.7);
+SELECT temperature FROM temperatures WHERE temperature BETWEEN 10 AND 30;
+temperature
+12.7
+28.2
+SELECT temperature FROM temperatures WHERE temperature BETWEEN -10 AND 20;
+temperature
+-2.8
+12.7
+SELECT title, temperature FROM temperatures WHERE temperature BETWEEN 10 AND 30;
+title	temperature
+Rainy!	12.7
+Hot!	28.2
+SELECT title, temperature FROM temperatures WHERE temperature BETWEEN -10 AND 20;
+title	temperature
+Snow!	-2.8
+Rainy!	12.7
+DROP TABLE temperatures;
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_index_select_float.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_index_select_float.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_index_select_float.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,28 @@
+DROP TABLE IF EXISTS temperatures;
+CREATE TABLE temperatures (
+id INT PRIMARY KEY AUTO_INCREMENT,
+title VARCHAR(20),
+temperature FLOAT,
+KEY temperature_index(temperature),
+KEY multi_index(temperature, title)
+);
+INSERT INTO temperatures VALUES (NULL, "Hot!", 28.2);
+INSERT INTO temperatures VALUES (NULL, "Snow!", -2.8);
+INSERT INTO temperatures VALUES (NULL, "Rainy!", 12.7);
+SELECT temperature FROM temperatures WHERE temperature BETWEEN 10 AND 30;
+temperature
+12.7
+28.2
+SELECT temperature FROM temperatures WHERE temperature BETWEEN -10 AND 20;
+temperature
+-2.8
+12.7
+SELECT title, temperature FROM temperatures WHERE temperature BETWEEN 10 AND 30;
+title	temperature
+Rainy!	12.7
+Hot!	28.2
+SELECT title, temperature FROM temperatures WHERE temperature BETWEEN -10 AND 20;
+title	temperature
+Snow!	-2.8
+Rainy!	12.7
+DROP TABLE temperatures;
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_index_select_int.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_index_select_int.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_index_select_int.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,37 @@
+DROP TABLE IF EXISTS listing;
+CREATE TABLE scores (
+id INT PRIMARY KEY AUTO_INCREMENT NOT NULL,
+name CHAR(30) NOT NULL,
+score INT NOT NULL,
+INDEX property (score, name)
+) DEFAULT CHARSET=UTF8;
+SHOW CREATE TABLE scores;
+Table	Create Table
+scores	CREATE TABLE `scores` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` char(30) NOT NULL,
+  `score` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `property` (`score`,`name`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO scores (name, score) VALUES("Taro Yamada", 29);
+INSERT INTO scores (name, score) VALUES("Taro Yamada", -12);
+INSERT INTO scores (name, score) VALUES("Jiro Yamada", 27);
+INSERT INTO scores (name, score) VALUES("Taro Yamada", 10);
+SELECT * FROM scores;
+id	name	score
+1	Taro Yamada	29
+2	Taro Yamada	-12
+3	Jiro Yamada	27
+4	Taro Yamada	10
+SELECT * FROM scores WHERE score = 29;
+id	name	score
+1	Taro Yamada	29
+SELECT * FROM scores WHERE score = 29 AND name = "Taro Yamada";
+id	name	score
+1	Taro Yamada	29
+SELECT * FROM scores WHERE (score >= -12 AND score < 29) AND name = "Taro Yamada";
+id	name	score
+2	Taro Yamada	-12
+4	Taro Yamada	10
+DROP TABLE scores;
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_index_select_string.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_index_select_string.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_index_select_string.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,40 @@
+drop table if exists listing;
+set names utf8;
+create table listing (
+id int primary key auto_increment not null,
+last_name char(30) not null,
+first_name char(30) not null,
+index name (last_name, first_name)
+) default charset utf8;
+show create table listing;
+Table	Create Table
+listing	CREATE TABLE `listing` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `last_name` char(30) NOT NULL,
+  `first_name` char(30) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `name` (`last_name`,`first_name`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into listing (last_name, first_name) values("Taro", "Yamada");
+insert into listing (last_name, first_name) values("Taro", "Suzuki");
+insert into listing (last_name, first_name) values("Jiro", "Yamada");
+insert into listing (last_name, first_name) values("Taro", "Tanaka");
+select * from listing;
+id	last_name	first_name
+1	Taro	Yamada
+2	Taro	Suzuki
+3	Jiro	Yamada
+4	Taro	Tanaka
+select * from listing where last_name = "Taro";
+id	last_name	first_name
+2	Taro	Suzuki
+4	Taro	Tanaka
+1	Taro	Yamada
+select * from listing where last_name = "Taro" and first_name = "Suzuki";
+id	last_name	first_name
+2	Taro	Suzuki
+select * from listing where last_name = "Taro" and (first_name >= "S" and first_name <= "Y");
+id	last_name	first_name
+2	Taro	Suzuki
+4	Taro	Tanaka
+drop table listing;
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_index_select_varchar.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_index_select_varchar.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_index_select_varchar.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,39 @@
+drop table if exists scores;
+set names utf8;
+create table scores (
+given_name varchar(30) not null,
+family_name varchar(30) not null,
+score int not null,
+primary key property (given_name, family_name, score)
+) default charset utf8;
+show create table scores;
+Table	Create Table
+scores	CREATE TABLE `scores` (
+  `given_name` varchar(30) NOT NULL,
+  `family_name` varchar(30) NOT NULL,
+  `score` int(11) NOT NULL,
+  PRIMARY KEY (`given_name`,`family_name`,`score`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into scores values("Taro", "Yamada", 29);
+insert into scores values("Taro", "Yamada", -12);
+insert into scores values("Jiro", "Yamada", 27);
+insert into scores values("Taro", "Yamada", 10);
+select * from scores;
+given_name	family_name	score
+Jiro	Yamada	27
+Taro	Yamada	-12
+Taro	Yamada	10
+Taro	Yamada	29
+select * from scores where given_name = "Taro" and family_name = "Yamada";
+given_name	family_name	score
+Taro	Yamada	-12
+Taro	Yamada	10
+Taro	Yamada	29
+select * from scores where given_name = "Taro" and family_name = "Yamada" and score = 29;
+given_name	family_name	score
+Taro	Yamada	29
+select * from scores where given_name = "Taro" and family_name = "Yamada" and (score >= -12 and score < 29);
+given_name	family_name	score
+Taro	Yamada	-12
+Taro	Yamada	10
+drop table scores;
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_index_update.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_index_update.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_index_update.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,34 @@
+drop table if exists listing;
+set names utf8;
+create table scores (
+id int primary key auto_increment not null,
+name char(30) not null,
+score int not null,
+index property (name, score)
+) default charset utf8;
+show create table scores;
+Table	Create Table
+scores	CREATE TABLE `scores` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` char(30) NOT NULL,
+  `score` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `property` (`name`,`score`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into scores (name, score) values("Taro Yamada", 29);
+insert into scores (name, score) values("Taro Yamada", -12);
+insert into scores (name, score) values("Jiro Yamada", 27);
+insert into scores (name, score) values("Taro Yamada", 10);
+select * from scores;
+id	name	score
+1	Taro Yamada	29
+2	Taro Yamada	-12
+3	Jiro Yamada	27
+4	Taro Yamada	10
+update scores set name = "Taro Yamada" where name = "Jiro Yamada" and score = 27;
+select * from scores where name = "Taro Yamada" and (score >= -12 and score < 29);
+id	name	score
+2	Taro Yamada	-12
+4	Taro Yamada	10
+3	Taro Yamada	27
+drop table scores;
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_index_update_int.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_index_update_int.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_index_update_int.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,30 @@
+DROP TABLE IF EXISTS scores;
+CREATE TABLE scores (
+id INT PRIMARY KEY AUTO_INCREMENT NOT NULL,
+name CHAR(30) NOT NULL,
+score INT NOT NULL,
+KEY property (score, name)
+) DEFAULT CHARSET=UTF8;
+SHOW CREATE TABLE scores;
+Table	Create Table
+scores	CREATE TABLE `scores` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` char(30) NOT NULL,
+  `score` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `property` (`score`,`name`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO scores (name, score) VALUES("Taro Yamada", 29);
+INSERT INTO scores (name, score) VALUES("Taro Yamada", -12);
+INSERT INTO scores (name, score) VALUES("Jiro Yamada", 29);
+INSERT INTO scores (name, score) VALUES("Taro Yamada", 10);
+SELECT * FROM scores WHERE score = 29;
+id	name	score
+3	Jiro Yamada	29
+1	Taro Yamada	29
+UPDATE scores SET name = "Saburo YAMADA" WHERE id = 3;
+SELECT * FROM scores WHERE score = 29;
+id	name	score
+3	Saburo YAMADA	29
+1	Taro Yamada	29
+DROP TABLE scores;
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_primary_key_delete.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_primary_key_delete.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_primary_key_delete.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,29 @@
+drop table if exists listing;
+set names utf8;
+create table scores (
+name char(30) not null,
+score int not null,
+primary key (name, score)
+) default charset utf8;
+show create table scores;
+Table	Create Table
+scores	CREATE TABLE `scores` (
+  `name` char(30) NOT NULL,
+  `score` int(11) NOT NULL,
+  PRIMARY KEY (`name`,`score`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into scores (name, score) values("Taro Yamada", 29);
+insert into scores (name, score) values("Taro Yamada", -12);
+insert into scores (name, score) values("Jiro Yamada", 27);
+insert into scores (name, score) values("Taro Yamada", 10);
+select * from scores;
+name	score
+Jiro Yamada	27
+Taro Yamada	-12
+Taro Yamada	10
+Taro Yamada	29
+delete from scores where name = "Taro Yamada" and score = 10;
+select * from scores where name = "Taro Yamada" and (score >= -12 and score < 29);
+name	score
+Taro Yamada	-12
+drop table scores;
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_primary_key_select_int.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_primary_key_select_int.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_primary_key_select_int.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,37 @@
+drop table if exists listing;
+set names utf8;
+create table scores (
+name char(30) not null,
+score int not null,
+primary key (name, score)
+) default charset utf8;
+show create table scores;
+Table	Create Table
+scores	CREATE TABLE `scores` (
+  `name` char(30) NOT NULL,
+  `score` int(11) NOT NULL,
+  PRIMARY KEY (`name`,`score`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into scores (name, score) values("Taro Yamada", 29);
+insert into scores (name, score) values("Taro Yamada", -12);
+insert into scores (name, score) values("Jiro Yamada", 27);
+insert into scores (name, score) values("Taro Yamada", 10);
+select * from scores;
+name	score
+Jiro Yamada	27
+Taro Yamada	-12
+Taro Yamada	10
+Taro Yamada	29
+select * from scores where name = "Taro Yamada";
+name	score
+Taro Yamada	-12
+Taro Yamada	10
+Taro Yamada	29
+select * from scores where name = "Taro Yamada" and score = 29;
+name	score
+Taro Yamada	29
+select * from scores where name = "Taro Yamada" and (score >= -12 and score < 29);
+name	score
+Taro Yamada	-12
+Taro Yamada	10
+drop table scores;
 
=== added file 'mysql-test/suite/mroonga_storage/r/multiple_column_primary_key_update.result'
--- mysql-test/suite/mroonga_storage/r/multiple_column_primary_key_update.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/multiple_column_primary_key_update.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,32 @@
+drop table if exists listing;
+set names utf8;
+create table scores (
+name char(30) not null,
+score int not null,
+primary key (name, score)
+) default charset utf8;
+show create table scores;
+Table	Create Table
+scores	CREATE TABLE `scores` (
+  `name` char(30) NOT NULL,
+  `score` int(11) NOT NULL,
+  PRIMARY KEY (`name`,`score`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+insert into scores (name, score) values("Taro Yamada", 29);
+insert into scores (name, score) values("Taro Yamada", -12);
+insert into scores (name, score) values("Jiro Yamada", 27);
+insert into scores (name, score) values("Taro Yamada", 10);
+select * from scores;
+name	score
+Jiro Yamada	27
+Taro Yamada	-12
+Taro Yamada	10
+Taro Yamada	29
+update scores set name = "Taro Yamada" where name = "Jiro Yamada" and score = 27;
+Warnings:
+Warning	1265	data truncated for primary key column: <name>
+select * from scores where name = "Taro Yamada" and (score >= -12 and score < 29);
+name	score
+Taro Yamada	-12
+Taro Yamada	10
+drop table scores;
 
=== added file 'mysql-test/suite/mroonga_storage/r/optimization_order_limit_disabled.result'
--- mysql-test/suite/mroonga_storage/r/optimization_order_limit_disabled.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/optimization_order_limit_disabled.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,47 @@
+DROP TABLE IF EXISTS diaries;
+FLUSH STATUS;
+SET NAMES UTF8;
+CREATE TABLE diaries (
+id INT UNSIGNED NOT NULL,
+year INT UNSIGNED,
+month INT UNSIGNED,
+day INT UNSIGNED,
+title VARCHAR(255),
+content TEXT,
+FULLTEXT INDEX(content),
+KEY(month),
+KEY(day)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(10) unsigned NOT NULL,
+  `year` int(10) unsigned DEFAULT NULL,
+  `month` int(10) unsigned DEFAULT NULL,
+  `day` int(10) unsigned DEFAULT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  KEY `month` (`month`),
+  KEY `day` (`day`),
+  FULLTEXT KEY `content` (`content`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日�ら������。");
+INSERT INTO diaries VALUES(2, 2011, 11, 10, "天気", "明日�富士山�天気����");
+INSERT INTO diaries VALUES(3, 2011, 11, 11, "富士山", "今日も天気�よ���れ��見�る。");
+INSERT INTO diaries VALUES(4, 2011, 11, 12, "帰り�", "今日�天気�よ��よ���。");
+INSERT INTO diaries VALUES(5, 2011, 11, 13, "�れ", "天気�よ���今日�����。");
+INSERT INTO diaries VALUES(6, 2011, 12, 1, "久��り", "天気�悪��ら���留守番。");
+INSERT INTO diaries VALUES(7, 2011, 12, 2, "�雪", "今日�天気�雪�");
+SET mroonga_enable_optimization=FALSE;
+SELECT * FROM diaries
+WHERE MATCH(content) AGAINST("今日" IN BOOLEAN MODE) AND
+month = 11
+ORDER BY day LIMIT 1,2;
+id	year	month	day	title	content
[phone]	富士山	今日も天気�よ���れ��見�る。
[phone]	帰り�	今日�天気�よ��よ���。
+SHOW STATUS LIKE 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	0
+SET mroonga_enable_optimization=TRUE;
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/optimization_order_limit_equal_int.result'
--- mysql-test/suite/mroonga_storage/r/optimization_order_limit_equal_int.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/optimization_order_limit_equal_int.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,45 @@
+DROP TABLE IF EXISTS diaries;
+FLUSH STATUS;
+SET NAMES UTF8;
+CREATE TABLE diaries (
+id INT UNSIGNED NOT NULL,
+year INT UNSIGNED,
+month INT UNSIGNED,
+day INT UNSIGNED,
+title VARCHAR(255),
+content TEXT,
+FULLTEXT INDEX(content),
+KEY(month),
+KEY(day)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(10) unsigned NOT NULL,
+  `year` int(10) unsigned DEFAULT NULL,
+  `month` int(10) unsigned DEFAULT NULL,
+  `day` int(10) unsigned DEFAULT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  KEY `month` (`month`),
+  KEY `day` (`day`),
+  FULLTEXT KEY `content` (`content`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日�ら������。");
+INSERT INTO diaries VALUES(2, 2011, 11, 10, "天気", "明日�富士山�天気����");
+INSERT INTO diaries VALUES(3, 2011, 11, 11, "富士山", "今日も天気�よ���れ��見�る。");
+INSERT INTO diaries VALUES(4, 2011, 11, 12, "帰り�", "今日�天気�よ��よ���。");
+INSERT INTO diaries VALUES(5, 2011, 11, 13, "�れ", "天気�よ���今日�����。");
+INSERT INTO diaries VALUES(6, 2011, 12, 1, "久��り", "天気�悪��ら���留守番。");
+INSERT INTO diaries VALUES(7, 2011, 12, 2, "�雪", "今日�天気�雪�");
+SELECT * FROM diaries
+WHERE MATCH(content) AGAINST("今日" IN BOOLEAN MODE) AND
+month = 11
+ORDER BY day LIMIT 1,2;
+id	year	month	day	title	content
[phone]	富士山	今日も天気�よ���れ��見�る。
[phone]	帰り�	今日�天気�よ��よ���。
+SHOW STATUS LIKE 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	1
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/optimization_order_limit_have_primary_key.result'
--- mysql-test/suite/mroonga_storage/r/optimization_order_limit_have_primary_key.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/optimization_order_limit_have_primary_key.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,43 @@
+DROP TABLE IF EXISTS diaries;
+FLUSH STATUS;
+SET NAMES UTF8;
+CREATE TABLE diaries (
+id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+year INT UNSIGNED,
+month INT UNSIGNED,
+day INT UNSIGNED,
+title VARCHAR(255),
+content TEXT,
+FULLTEXT INDEX(content),
+KEY(day)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `year` int(10) unsigned DEFAULT NULL,
+  `month` int(10) unsigned DEFAULT NULL,
+  `day` int(10) unsigned DEFAULT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  PRIMARY KEY (`id`),
+  KEY `day` (`day`),
+  FULLTEXT KEY `content` (`content`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日�ら������。");
+INSERT INTO diaries VALUES(2, 2011, 11, 10, "天気", "明日�富士山�天気����");
+INSERT INTO diaries VALUES(3, 2011, 11, 11, "富士山", "今日も天気�よ���れ��見�る。");
+INSERT INTO diaries VALUES(4, 2011, 11, 11, "帰り�", "今日�天気�よ��よ���。");
+INSERT INTO diaries VALUES(5, 2011, 12, 1, "久��り", "天気�悪��ら���留守番。");
+INSERT INTO diaries VALUES(6, 2011, 12, 2, "�雪", "今日�天気�雪�");
+SELECT * FROM diaries WHERE MATCH(content) AGAINST("今日 天気" IN BOOLEAN MODE) ORDER BY day LIMIT 0,5;
+id	year	month	day	title	content
[phone]	久��り	天気�悪��ら���留守番。
[phone]	�雪	今日�天気�雪�
[phone]	Hello	今日�ら������。
[phone]	天気	明日�富士山�天気����
[phone]	帰り�	今日�天気�よ��よ���。
+SHOW STATUS LIKE 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	1
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/optimization_order_limit_no_primary_key.result'
--- mysql-test/suite/mroonga_storage/r/optimization_order_limit_no_primary_key.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/optimization_order_limit_no_primary_key.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,42 @@
+DROP TABLE IF EXISTS diaries;
+FLUSH STATUS;
+SET NAMES UTF8;
+CREATE TABLE diaries (
+id INT UNSIGNED NOT NULL,
+year INT UNSIGNED,
+month INT UNSIGNED,
+day INT UNSIGNED,
+title VARCHAR(255),
+content TEXT,
+FULLTEXT INDEX(content),
+KEY(day)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(10) unsigned NOT NULL,
+  `year` int(10) unsigned DEFAULT NULL,
+  `month` int(10) unsigned DEFAULT NULL,
+  `day` int(10) unsigned DEFAULT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  KEY `day` (`day`),
+  FULLTEXT KEY `content` (`content`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries VALUES(1, 2011, 11, 9, "Hello", "今日�ら������。");
+INSERT INTO diaries VALUES(2, 2011, 11, 10, "天気", "明日�富士山�天気����");
+INSERT INTO diaries VALUES(3, 2011, 11, 11, "富士山", "今日も天気�よ���れ��見�る。");
+INSERT INTO diaries VALUES(4, 2011, 11, 11, "帰り�", "今日�天気�よ��よ���。");
+INSERT INTO diaries VALUES(5, 2011, 12, 1, "久��り", "天気�悪��ら���留守番。");
+INSERT INTO diaries VALUES(6, 2011, 12, 2, "�雪", "今日�天気�雪�");
+SELECT * FROM diaries WHERE MATCH(content) AGAINST("今日 天気" IN BOOLEAN MODE) ORDER BY day LIMIT 0,5;
+id	year	month	day	title	content
[phone]	久��り	天気�悪��ら���留守番。
[phone]	�雪	今日�天気�雪�
[phone]	Hello	今日�ら������。
[phone]	天気	明日�富士山�天気����
[phone]	帰り�	今日�天気�よ��よ���。
+SHOW STATUS LIKE 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	1
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/optimization_order_limit_todo_split_me.result'
--- mysql-test/suite/mroonga_storage/r/optimization_order_limit_todo_split_me.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/optimization_order_limit_todo_split_me.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,136 @@
+drop table if exists t1;
+flush status;
+create table t1 (c1 int primary key, c2 int, c3 text, _id int, key idx1(c2), fulltext index ft(c3)) default charset utf8;
+insert into t1 values(1,10,"aa ii uu ee oo",null);
+insert into t1 values(2,20,"ka ki ku ke ko",null);
+insert into t1 values(3,30,"ii si ii se ii",null);
+insert into t1 values(4,40,"ta ti tu te to",null);
+insert into t1 values(5,50,"aa ii uu ii oo",null);
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	0
+select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c1 desc;
+c1	c2	c3	_id	match(c3) against("ii")
+5	50	aa ii uu ii oo	5	349526
+3	30	ii si ii se ii	3	524289
+1	10	aa ii uu ee oo	1	174763
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	0
+select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c1 desc limit 1;
+c1	c2	c3	_id	match(c3) against("ii")
+5	50	aa ii uu ii oo	5	349526
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	1
+select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c1;
+c1	c2	c3	_id	match(c3) against("ii")
+1	10	aa ii uu ee oo	1	174763
+3	30	ii si ii se ii	3	524289
+5	50	aa ii uu ii oo	5	349526
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	1
+select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c1 limit 1;
+c1	c2	c3	_id	match(c3) against("ii")
+1	10	aa ii uu ee oo	1	174763
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	2
+select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c2 desc;
+c1	c2	c3	_id	match(c3) against("ii")
+5	50	aa ii uu ii oo	5	349526
+3	30	ii si ii se ii	3	524289
+1	10	aa ii uu ee oo	1	174763
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	2
+select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c2 desc limit 1;
+c1	c2	c3	_id	match(c3) against("ii")
+5	50	aa ii uu ii oo	5	349526
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	3
+select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c2;
+c1	c2	c3	_id	match(c3) against("ii")
+1	10	aa ii uu ee oo	1	174763
+3	30	ii si ii se ii	3	524289
+5	50	aa ii uu ii oo	5	349526
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	3
+select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c2 limit 1;
+c1	c2	c3	_id	match(c3) against("ii")
+1	10	aa ii uu ee oo	1	174763
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	4
+select c3, match(c3) against("ii") from t1 where match(c3) against("ii") order by match(c3) against("ii") desc;
+c3	match(c3) against("ii")
+ii si ii se ii	524289
+aa ii uu ii oo	349526
+aa ii uu ee oo	174763
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	4
+select c3, match(c3) against("ii") from t1 where match(c3) against("ii") order by match(c3) against("ii") desc limit 1, 1;
+c3	match(c3) against("ii")
+aa ii uu ii oo	349526
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	5
+select c3, match(c3) against("ii") from t1 where match(c3) against("ii") order by match(c3) against("ii");
+c3	match(c3) against("ii")
+aa ii uu ee oo	174763
+aa ii uu ii oo	349526
+ii si ii se ii	524289
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	5
+select c3, match(c3) against("ii") from t1 where match(c3) against("ii") order by match(c3) against("ii") limit 1;
+c3	match(c3) against("ii")
+aa ii uu ee oo	174763
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	6
+select c3, _id from t1 where match(c3) against("ii") order by _id desc;
+c3	_id
+aa ii uu ii oo	5
+ii si ii se ii	3
+aa ii uu ee oo	1
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	6
+select c3, _id from t1 where match(c3) against("ii") order by _id desc limit 1;
+c3	_id
+aa ii uu ii oo	5
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	7
+select c3, _id from t1 where match(c3) against("ii") order by _id;
+c3	_id
+aa ii uu ee oo	1
+ii si ii se ii	3
+aa ii uu ii oo	5
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	7
+select c3, _id from t1 where match(c3) against("ii") order by _id limit 1;
+c3	_id
+aa ii uu ee oo	1
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	8
+select count(*) from t1 where match(c3) against("ii");
+count(*)
+3
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	8
+select *, match(c3) against("ii") from t1 where match(c3) against("ii") order by c1 desc limit 1;
+c1	c2	c3	_id	match(c3) against("ii")
+5	50	aa ii uu ii oo	5	349526
+show status like 'mroonga_fast_order_limit';
+Variable_name	Value
+mroonga_fast_order_limit	9
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/optimization_skip_count_after_insert_multithread.result'
--- mysql-test/suite/mroonga_storage/r/optimization_skip_count_after_insert_multithread.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/optimization_skip_count_after_insert_multithread.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS diaries;
+FLUSH STATUS;
+CREATE TABLE diaries (
+title TEXT,
+FULLTEXT INDEX ft(title)
+);
+INSERT INTO diaries VALUES("Hello mroonga!");
+INSERT INTO diaries VALUES("It's funny.");
+INSERT INTO diaries VALUES("Happy birthday!");
+SHOW STATUS LIKE 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	0
+SELECT COUNT(*) FROM diaries WHERE MATCH(title) AGAINST("mroonga" IN BOOLEAN MODE);
+COUNT(*)
+1
+SHOW STATUS LIKE 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	1
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/optimization_skip_count_after_insert_single_thread.result'
--- mysql-test/suite/mroonga_storage/r/optimization_skip_count_after_insert_single_thread.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/optimization_skip_count_after_insert_single_thread.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS diaries;
+FLUSH STATUS;
+CREATE TABLE diaries (
+title TEXT,
+FULLTEXT INDEX ft(title)
+);
+INSERT INTO diaries VALUES("Hello mroonga!");
+INSERT INTO diaries VALUES("It's funny.");
+INSERT INTO diaries VALUES("Happy birthday!");
+SHOW STATUS LIKE 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	0
+SELECT COUNT(*) FROM diaries WHERE MATCH(title) AGAINST("mroonga" IN BOOLEAN MODE);
+COUNT(*)
+1
+SHOW STATUS LIKE 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	1
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/optimization_skip_count_disabled.result'
--- mysql-test/suite/mroonga_storage/r/optimization_skip_count_disabled.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/optimization_skip_count_disabled.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,32 @@
+DROP TABLE IF EXISTS diaries;
+FLUSH STATUS;
+SET NAMES UTF8;
+CREATE TABLE diaries (
+id INT UNSIGNED NOT NULL,
+title VARCHAR(255),
+content TEXT,
+FULLTEXT INDEX(content)
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `id` int(10) unsigned NOT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `content` text,
+  FULLTEXT KEY `content` (`content`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries VALUES(1, "Hello", "今日�ら������。");
+INSERT INTO diaries VALUES(2, "天気", "明日�富士山�天気����");
+INSERT INTO diaries VALUES(3, "富士山", "今日も天気�よ���れ��見�る。");
+INSERT INTO diaries VALUES(4, "帰り�", "今日�天気�よ��よ���。");
+INSERT INTO diaries VALUES(5, "�れ", "天気�よ���今日�����。");
+SET mroonga_enable_optimization=FALSE;
+SELECT COUNT(*) FROM diaries
+WHERE MATCH(content) AGAINST("今日" IN BOOLEAN MODE);
+COUNT(*)
+4
+SHOW STATUS LIKE 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	0
+SET mroonga_enable_optimization=TRUE;
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/optimization_skip_count_index_view.result'
--- mysql-test/suite/mroonga_storage/r/optimization_skip_count_index_view.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/optimization_skip_count_index_view.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,28 @@
+DROP TABLE IF EXISTS diaries, users;
+CREATE TABLE diaries (
+id INT PRIMARY KEY AUTO_INCREMENT,
+user_id INT NOT NULL,
+title VARCHAR(45) NOT NULL,
+KEY (user_id),
+FULLTEXT INDEX title_index (title)
+) DEFAULT CHARSET=UTF8;
+CREATE TABLE users (
+id INT PRIMARY KEY AUTO_INCREMENT,
+name VARCHAR(45) NOT NULL,
+INDEX (name)
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+INSERT INTO users (id, name) VALUES (1, "Alice"), (2, "Bob");
+INSERT INTO diaries (user_id, title) VALUES (1, "survey");
+INSERT INTO diaries (user_id, title) VALUES (2, "groonga (1)");
+INSERT INTO diaries (user_id, title) VALUES (2, "groonga (2)");
+CREATE VIEW articles AS
+SELECT diaries.user_id AS user_id,
+diaries.title AS title,
+users.name AS name
+FROM diaries, users
+WHERE diaries.user_id = users.id;
+SELECT COUNT(*) FROM articles WHERE name = 'Bob';
+COUNT(*)
+2
+DROP VIEW articles;
+DROP TABLE diaries, users;
 
=== added file 'mysql-test/suite/mroonga_storage/r/optimization_skip_count_todo_split_me.result'
--- mysql-test/suite/mroonga_storage/r/optimization_skip_count_todo_split_me.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/optimization_skip_count_todo_split_me.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,106 @@
+drop table if exists t1, t2, t3;
+flush status;
+create table t1 (c1 int primary key, c2 int, c3 text, key idx1(c2), fulltext index ft(c3));
+insert into t1 values(1,10,"aa ii uu ee oo");
+insert into t1 values(2,20,"ka ki ku ke ko");
+insert into t1 values(3,30,"sa si su se so");
+insert into t1 values(4,40,"ta ti tu te to");
+insert into t1 values(5,50,"aa ii uu ee oo");
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	0
+select * from t1;
+c1	c2	c3
+1	10	aa ii uu ee oo
+2	20	ka ki ku ke ko
+3	30	sa si su se so
+4	40	ta ti tu te to
+5	50	aa ii uu ee oo
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	0
+select count(*) from t1;
+count(*)
+5
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	0
+select * from t1 force index(primary) where c1 between 2 and 4;
+c1	c2	c3
+2	20	ka ki ku ke ko
+3	30	sa si su se so
+4	40	ta ti tu te to
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	0
+select count(*) from t1 force index(primary) where c1 between 2 and 4;
+count(*)
+3
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	1
+select c1 from t1 force index(primary) where c1 < 3;
+c1
+1
+2
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	1
+select count(c1) from t1 force index(primary) where c1 < 3;
+count(c1)
+2
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	1
+select 1 from t1 force index(primary) where c1 > 3;
+1
+1
+1
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	1
+select count(1) from t1 force index(primary) where c1 > 3;
+count(1)
+2
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	2
+select * from t1 where match(c3) against("su");
+c1	c2	c3
+3	30	sa si su se so
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	2
+select count(*) from t1 where match(c3) against("su");
+count(*)
+1
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	3
+select * from t1 where match(c3) against("+su" in boolean mode);
+c1	c2	c3
+3	30	sa si su se so
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	3
+select count(*) from t1 where match(c3) against("+su" in boolean mode);
+count(*)
+1
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	4
+select * from t1 force index(idx1) where c2 between 20 and 40;
+c1	c2	c3
+2	20	ka ki ku ke ko
+3	30	sa si su se so
+4	40	ta ti tu te to
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	4
+select count(*) from t1 force index(idx1) where c2 between 20 and 40;
+count(*)
+3
+show status like 'mroonga_count_skip';
+Variable_name	Value
+mroonga_count_skip	5
+drop table t1;
 
=== added file 'mysql-test/suite/mroonga_storage/r/primary_key_date.result'
--- mysql-test/suite/mroonga_storage/r/primary_key_date.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/primary_key_date.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,28 @@
+DROP TABLE IF EXISTS diaries;
+CREATE TABLE diaries (
+day DATE PRIMARY KEY,
+title TEXT
+) DEFAULT CHARSET UTF8;
+SHOW CREATE TABLE diaries;
+Table	Create Table
+diaries	CREATE TABLE `diaries` (
+  `day` date NOT NULL,
+  `title` text,
+  PRIMARY KEY (`day`)
+) ENGINE=mroonga DEFAULT CHARSET=utf8
+INSERT INTO diaries (day, title) VALUES ("2012-01-29", "clear day");
+INSERT INTO diaries (day, title) VALUES ("2012-01-30", "rainy day");
+INSERT INTO diaries (day, title) VALUES ("2012-01-31", "cloudy day");
+INSERT INTO diaries (day, title) VALUES ("2012-01-31", "duplicated day");
+ERROR 23000: Duplicate entry '2012-01-31' for key 'PRIMARY'
+SELECT * FROM diaries;
+day	title
[phone]	clear day
[phone]	rainy day
[phone]	cloudy day
+SELECT * FROM diaries
+WHERE day BETWEEN "2012-01-29" AND "2012-01-30";
+day	title
[phone]	clear day
[phone]	rainy day
+DROP TABLE diaries;
 
=== added file 'mysql-test/suite/mroonga_storage/r/primary_key_datetime_with_fractional_seconds.result'
--- mysql-test/suite/mroonga_storage/r/primary_key_datetime_with_fractional_seconds.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/mroonga_storage/r/primary_key_datetime_with_fractional_seconds.result	2012-04-27 12:15:31 +0000
@@ -0,0 +1,30 @@