summaryrefslogtreecommitdiff
path: root/sql/sql_yacc.yy
diff options
context:
space:
mode:
authorChad MILLER <chad@mysql.com>2009-04-14 13:20:13 -0400
committerChad MILLER <chad@mysql.com>2009-04-14 13:20:13 -0400
commit14f923c0286588f9f391a2fda8b9fab5a4e2953c (patch)
tree55596b47965261462217616f8271d0c2b9d79ab0 /sql/sql_yacc.yy
parent9d7f61dc698ee6b1dd379cc5820c59b8a9806c2d (diff)
parentbd2db28cdad7e715b9efcee2f440f432a0562e8f (diff)
downloadmariadb-git-14f923c0286588f9f391a2fda8b9fab5a4e2953c.tar.gz
Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r--sql/sql_yacc.yy5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index b08650ac4f7..04caaa7ad20 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -7525,6 +7525,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");