diff options
| author | serg@serg.mylan <> | 2005-02-04 15:31:39 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-02-04 15:31:39 +0100 |
| commit | 47f354bca710d70ae4874ff8c1d295a604917749 (patch) | |
| tree | 01c66c5c69b4c95dd26d4e4d07d34a09e911eedc /sql/item_func.cc | |
| parent | b0bf1950647d0bad79da7f6435785c99a080106b (diff) | |
| parent | cc1ee6475f9a15415c81867f239f71a0bb1c969c (diff) | |
| download | mariadb-git-47f354bca710d70ae4874ff8c1d295a604917749.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
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 7d38c44bab3..f226603d9d1 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3043,9 +3043,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; @@ -3087,12 +3085,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"); |