mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 15:15:34 +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
11
sql/opt_ft.h
11
sql/opt_ft.h
|
|
@ -31,16 +31,7 @@ public:
|
|||
FT_SELECT(TABLE *table, TABLE_REF *tref) :
|
||||
QUICK_SELECT (table,tref->key,1), ref(tref) {}
|
||||
|
||||
int init()
|
||||
{
|
||||
#if 0
|
||||
if (cp_buffer_from_ref(ref)) // as ft-key doesn't use store_key's
|
||||
return -1;
|
||||
#endif
|
||||
return error=file->ft_init(ref->key,
|
||||
ref->key_buff,
|
||||
ref->key_length);
|
||||
}
|
||||
int init() { return error=file->ft_init(); }
|
||||
int get_next() { return error=file->ft_read(record); }
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue