diff options
| author | Sergey Vojtovich <svoj@mysql.com> | 2009-02-12 14:10:07 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mysql.com> | 2009-02-12 14:10:07 +0400 |
| commit | e994c4f97bb95482421f806f30c9cbfb6fb1c1fa (patch) | |
| tree | eec01907ccd1cf8942bb60180c789044a9d00af3 /sql/item_func.cc | |
| parent | ccca4feca8c4134ef00ca1acaba32ff553c4c947 (diff) | |
| parent | 5803e106282eddbfed171f5d76f5357418d32af7 (diff) | |
| download | mariadb-git-e994c4f97bb95482421f806f30c9cbfb6fb1c1fa.tar.gz | |
Merge 5.0-bugteam -> 5.1-bugteam.
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 34cb50ee7fa..ec95254baaa 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -5371,7 +5371,10 @@ bool Item_func_match::fix_fields(THD *thd, Item **ref) if (item->type() == Item::REF_ITEM) args[i]= item= *((Item_ref *)item)->ref; if (item->type() != Item::FIELD_ITEM) - key=NO_SUCH_KEY; + { + my_error(ER_WRONG_ARGUMENTS, MYF(0), "AGAINST"); + return TRUE; + } } /* Check that all columns come from the same table. |