summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--myisam/ft_dump.c3
-rw-r--r--myisam/myisamchk.c1
-rw-r--r--mysql-test/r/fulltext.result2
3 files changed, 5 insertions, 1 deletions
diff --git a/myisam/ft_dump.c b/myisam/ft_dump.c
index 183068789fe..6aa5323d757 100644
--- a/myisam/ft_dump.c
+++ b/myisam/ft_dump.c
@@ -80,8 +80,11 @@ int main(int argc,char *argv[])
if (argc < 2)
usage();
+ init_key_cache(dflt_keycache,MI_KEY_BLOCK_LENGTH,USE_BUFFER_INIT,0);
+
if (!(info=mi_open(argv[0],2,HA_OPEN_ABORT_IF_LOCKED)))
goto err;
+ VOID(mi_extra(info, HA_EXTRA_SET_KEY_CACHE, dflt_keycache));
inx=atoi(argv[1]);
*buf2=0;
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index 59cc26b198b..9136117b86e 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -794,6 +794,7 @@ static int myisamchk(MI_CHECK *param, my_string filename)
share->tot_locks-= share->r_locks;
share->r_locks=0;
raid_chunks=share->base.raid_chunks;
+ VOID(mi_extra(info, HA_EXTRA_SET_KEY_CACHE, dflt_keycache));
/*
Skip the checking of the file if:
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 385e2d52fb5..3f64025e4c4 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -34,8 +34,8 @@ Full-text indexes are called collections
Only MyISAM tables support collections
select * from t1 where MATCH(a,b) AGAINST ("indexes collections" WITH QUERY EXPANSION);
a b
-Only MyISAM tables support collections
Full-text indexes are called collections
+Only MyISAM tables support collections
MySQL has now support for full-text search
explain select * from t1 where MATCH(a,b) AGAINST ("collections");
id select_type table type possible_keys key key_len ref rows Extra