diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-03-19 09:44:58 -0400 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-03-19 09:44:58 -0400 |
| commit | 675c3ce2bbe7f033930822dd0ef9126ebb25d44b (patch) | |
| tree | 0d1697348f5ffacdf22ddce0537910d41d6482f0 /sql/item_func.cc | |
| parent | 54fbbf9591e21cda9f7b26c2d795d88f51827f07 (diff) | |
| parent | 0d18d930aed47ed97ef3309f9510cfd7a366202e (diff) | |
| download | mariadb-git-675c3ce2bbe7f033930822dd0ef9126ebb25d44b.tar.gz | |
auto-merge
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 8aa2565d928..47e16a1bcc3 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4961,7 +4961,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. |