diff options
| author | unknown <serg@serg.mysql.com> | 2000-11-02 17:36:21 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2000-11-02 17:36:21 +0100 |
| commit | e735267f69bd02a9f7246d72d07100e6179bc33e (patch) | |
| tree | c2c98089c936e8e55bca2409f12161c8224087c8 /sql/ha_myisam.h | |
| parent | 2db1639c904630c2ad8369fb2ae808be5395980f (diff) | |
| download | mariadb-git-e735267f69bd02a9f7246d72d07100e6179bc33e.tar.gz | |
Ill-minded FULLTEXT impilict initialization hack removed.
From now on FULLTEXT search is initialized expilictly in mysql_select()
sql/item_func.cc:
FULLTEXT expilict initialization
sql/opt_ft.h:
FULLTEXT expilict initialization
sql/opt_range.h:
FULLTEXT expilict initialization
sql/ha_myisam.cc:
FULLTEXT expilict initialization
sql/ha_myisam.h:
FULLTEXT expilict initialization
sql/handler.h:
FULLTEXT expilict initialization
sql/item_func.h:
FULLTEXT expilict initialization
sql/sql_select.cc:
FULLTEXT expilict initialization
myisam/ft_search.c:
FULLTEXT expilict initialization
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); |