diff options
| author | Matthias Leich <Matthias.Leich@sun.com> | 2009-02-13 13:55:29 +0100 |
|---|---|---|
| committer | Matthias Leich <Matthias.Leich@sun.com> | 2009-02-13 13:55:29 +0100 |
| commit | 5d0054012d2f64baf3d73e0d56c501cee017546f (patch) | |
| tree | 62271efa412c4f8ff26523bc8c92cb0abeb03210 /sql | |
| parent | 0fab1a857c12239e8c75e409f2a0c3ba4d021535 (diff) | |
| parent | 47c53135fdf8af0fdb4324cae38e67e10dfd201d (diff) | |
| download | mariadb-git-5d0054012d2f64baf3d73e0d56c501cee017546f.tar.gz | |
Merge actual tree -> local GCA tree, no conflicts
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 5 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 913b32ccb88..55324923fe2 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. diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0eefe782354..51fb5dbdfe4 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -7512,6 +7512,11 @@ drop: THD *thd= YYTHD; LEX *lex= thd->lex; sp_name *spname; + if ($4.str && check_db_name($4.str)) + { + my_error(ER_WRONG_DB_NAME, MYF(0), $4.str); + MYSQL_YYABORT; + } if (lex->sphead) { my_error(ER_SP_NO_DROP_SP, MYF(0), "FUNCTION"); |