diff options
| author | serg@serg.mylan <> | 2005-02-04 15:24:06 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-02-04 15:24:06 +0100 |
| commit | cc1ee6475f9a15415c81867f239f71a0bb1c969c (patch) | |
| tree | 2046dfa1cc3d0a3296de2bdfbd4d1ad59ece8f58 /sql/item_func.cc | |
| parent | 33fc4b10b69e06bb4162a3d2650eab00e0b8927c (diff) | |
| download | mariadb-git-cc1ee6475f9a15415c81867f239f71a0bb1c969c.tar.gz | |
indexless boolean fulltext search was depending on default_charset_info - Bug#8159
ftbw->off wasn't cleared on reinit - Bug#8234
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index bff49541252..85cd1c693b7 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3047,9 +3047,7 @@ void Item_func_match::init_search(bool no_order) if (join_key && !no_order) flags|=FT_SORTED; - ft_handler=table->file->ft_init_ext(flags, key, - (byte*) ft_tmp->ptr(), - ft_tmp->length()); + ft_handler=table->file->ft_init_ext(flags, key, ft_tmp); if (join_key) table->file->ft_handler=ft_handler; @@ -3091,12 +3089,12 @@ bool Item_func_match::fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref) } /* Check that all columns come from the same table. - We've already checked that columns in MATCH are fields so + We've already checked that columns in MATCH are fields so PARAM_TABLE_BIT can only appear from AGAINST argument. */ if ((used_tables_cache & ~PARAM_TABLE_BIT) != item->used_tables()) key=NO_SUCH_KEY; - + if (key == NO_SUCH_KEY && !(flags & FT_BOOL)) { my_error(ER_WRONG_ARGUMENTS,MYF(0),"MATCH"); |