mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
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
This commit is contained in:
parent
2db1639c90
commit
e735267f69
9 changed files with 44 additions and 74 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue