diff options
| -rw-r--r-- | config/ac-macros/ha_blackhole.m4 | 29 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | mysql-test/r/blackhole.result | 2 |
3 files changed, 31 insertions, 1 deletions
diff --git a/config/ac-macros/ha_blackhole.m4 b/config/ac-macros/ha_blackhole.m4 new file mode 100644 index 00000000000..cc4d360f5a8 --- /dev/null +++ b/config/ac-macros/ha_blackhole.m4 @@ -0,0 +1,29 @@ +dnl --------------------------------------------------------------------------- +dnl Macro: MYSQL_CHECK_BLACKHOLEDB +dnl Sets HAVE_BLACKHOLE_DB if --with-blackhole-storage-engine is used +dnl --------------------------------------------------------------------------- +AC_DEFUN([MYSQL_CHECK_BLACKHOLEDB], [ + AC_ARG_WITH([blackhole-storage-engine], + [ + --with-blackhole-storage-engine + Enable the Blackhole Storage Engine], + [blackholedb="$withval"], + [blackholedb=no]) + AC_MSG_CHECKING([for blackhole storage engine]) + + case "$blackholedb" in + yes ) + AC_DEFINE([HAVE_BLACKHOLE_DB], [1], [Builds Blackhole Storage Engine]) + AC_MSG_RESULT([yes]) + [blackholedb=yes] + ;; + * ) + AC_MSG_RESULT([no]) + [blackholedb=no] + ;; + esac + +]) +dnl --------------------------------------------------------------------------- +dnl END OF MYSQL_CHECK_BLACKHOLE SECTION +dnl --------------------------------------------------------------------------- diff --git a/configure.in b/configure.in index 6d7b117cc04..0b3f1ab31f1 100644 --- a/configure.in +++ b/configure.in @@ -37,6 +37,7 @@ sinclude(config/ac-macros/character_sets.m4) sinclude(config/ac-macros/compiler_flag.m4) sinclude(config/ac-macros/ha_archive.m4) sinclude(config/ac-macros/ha_berkeley.m4) +sinclude(config/ac-macros/ha_blackhole.m4) sinclude(config/ac-macros/ha_example.m4) sinclude(config/ac-macros/ha_federated.m4) sinclude(config/ac-macros/ha_innodb.m4) diff --git a/mysql-test/r/blackhole.result b/mysql-test/r/blackhole.result index 20018dcb089..a3053075de5 100644 --- a/mysql-test/r/blackhole.result +++ b/mysql-test/r/blackhole.result @@ -73,7 +73,7 @@ explain extended select * from t1 where MATCH(a,b) AGAINST ("collections"); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 fulltext a a 0 1 Using where Warnings: -Note 1003 select test.t1.a AS `a`,test.t1.b AS `b` from test.t1 where (match test.t1.a,test.t1.b against (_latin1'collections')) +Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (match `test`.`t1`.`a`,`test`.`t1`.`b` against (_latin1'collections')) select * from t1 where MATCH(a,b) AGAINST ("indexes"); a b Full-text indexes are called collections |