diff options
| author | unknown <serg@serg.mysql.com> | 2001-02-28 11:43:08 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-02-28 11:43:08 +0100 |
| commit | 72bc949c1ad82a53979140a545d1bcf5f1681a16 (patch) | |
| tree | 4ee841e8c45ebcfde147158a2a83643f44021800 /sql/sql_select.cc | |
| parent | 064c7adf422bddbad3dfdf1dc9d6246082b10a32 (diff) | |
| download | mariadb-git-72bc949c1ad82a53979140a545d1bcf5f1681a16.tar.gz | |
sql_select.cc MATCH ... AGAINST (NULL) bug fixed
item_func.cc MATCH ... AGAINST (NULL) bug fixed
fulltext.test MATCH ... AGAINST (NULL) bug fixed
fulltext.result MATCH ... AGAINST (NULL) bug fixed
mysql-test/r/fulltext.result:
MATCH ... AGAINST (NULL) bug fixed
mysql-test/t/fulltext.test:
MATCH ... AGAINST (NULL) bug fixed
sql/item_func.cc:
MATCH ... AGAINST (NULL) bug fixed
sql/sql_select.cc:
MATCH ... AGAINST (NULL) bug fixed
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index db1d3b7d774..1995274f9fc 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1968,9 +1968,6 @@ get_best_combination(JOIN *join) KEYUSE *keyuse; KEY *keyinfo; uint table_count; - String *ft_tmp=0; - char tmp1[FT_QUERY_MAXLEN]; - String tmp2(tmp1,sizeof(tmp1)); table_count=join->tables; if (!(join->join_tab=join_tab= @@ -2026,8 +2023,7 @@ get_best_combination(JOIN *join) { Item_func_match *ifm=(Item_func_match *)keyuse->val; - ft_tmp=ifm->key_item()->val_str(&tmp2); - length=ft_tmp->length(); + length=0; keyparts=1; ifm->join_key=1; } @@ -2070,16 +2066,9 @@ get_best_combination(JOIN *join) if (ftkey) { j->ref.items[0]=((Item_func*)(keyuse->val))->key_item(); - if (!keyuse->used_tables) - { - // AFAIK key_buff is zeroed... - // We don't need to free ft_tmp as the buffer will be freed atom. - memcpy((gptr)key_buff, (gptr) ft_tmp->ptr(), ft_tmp->length()); - } - else - { + if (keyuse->used_tables) return TRUE; // not supported yet. SerG - } + j->type=JT_FT; } else |