diff options
author | serg@serg.mysql.com <> | 2000-11-02 17:36:21 +0100 |
---|---|---|
committer | serg@serg.mysql.com <> | 2000-11-02 17:36:21 +0100 |
commit | ff8df2c42bc453ca8d89e9461347f75b571d2fb5 (patch) | |
tree | c2c98089c936e8e55bca2409f12161c8224087c8 /sql/ha_myisam.h | |
parent | a896b8722b73f45e9d581a603c84bbcfe0d1b1cb (diff) | |
download | mariadb-git-ff8df2c42bc453ca8d89e9461347f75b571d2fb5.tar.gz |
Ill-minded FULLTEXT impilict initialization hack removed.
From now on FULLTEXT search is initialized expilictly in mysql_select()
Diffstat (limited to 'sql/ha_myisam.h')
-rw-r--r-- | sql/ha_myisam.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_myisam.h b/sql/ha_myisam.h index e0165d46920..d9f322fe9ca 100644 --- a/sql/ha_myisam.h +++ b/sql/ha_myisam.h @@ -71,8 +71,9 @@ class ha_myisam: public handler int index_first(byte * buf); int index_last(byte * buf); int index_next_same(byte *buf, const byte *key, uint keylen); - int ft_init(uint inx,const byte *key, uint keylen, bool presort=1); - void *ft_init_ext(uint inx,const byte *key, uint keylen, bool presort=0) + int ft_init() + { if(!ft_handler) return 1; ft_reinit_search(ft_handler); return 0; } + void *ft_init_ext(uint inx,const byte *key, uint keylen, bool presort) { return ft_init_search(file,inx,(byte*) key,keylen,presort); } int ft_read(byte *buf); int rnd_init(bool scan=1); |