Commit e3528e0d authored by unknown's avatar unknown
Browse files

Adding rules for building blackhole, also updating test case. 


configure.in:
  Adding logic to run blackhole configure option.
mysql-test/r/blackhole.result:
  Correction this, but I think I need to see why the warning is being generated in the first place.
parent 752b825a

config/ac-macros/ha_blackhole.m4

0 → 100644
+29 −0
Original line number Diff line number Diff line 
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 ---------------------------------------------------------------------------

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -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)

mysql-test/r/blackhole.result

+1 −1
Original line number Diff line number Diff line
@@ -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