diff options
| author | unknown <pem@mysql.com> | 2006-01-19 11:48:07 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2006-01-19 11:48:07 +0100 |
| commit | 663fe66468143aa457a93bd180998d8187d53ca6 (patch) | |
| tree | 77998d0059ac8f7e597b7ada28b273f939d4a8d5 /sql/sql_yacc.yy | |
| parent | 48ac5c4a2b241d8fcc8f7266b4192664855e0ee6 (diff) | |
| parent | 1e968057523db1313438368812b99a38ba460542 (diff) | |
| download | mariadb-git-663fe66468143aa457a93bd180998d8187d53ca6.tar.gz | |
Merge mysql.com:/extern/mysql/bk/mysql-5.0
into mysql.com:/extern/mysql/work/bug15658/mysql-5.0
mysql-test/r/sp-error.result:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 714be26887c..2face8238b8 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1288,11 +1288,26 @@ clear_privileges: sp_name: ident '.' ident { + if (!$1.str || check_db_name($1.str)) + { + my_error(ER_WRONG_DB_NAME, MYF(0), $1.str); + YYABORT; + } + if (sp_name_check($3)) + { + my_error(ER_SP_WRONG_NAME, MYF(0), $3.str); + YYABORT; + } $$= new sp_name($1, $3); $$->init_qname(YYTHD); } | ident { + if (sp_name_check($1)) + { + my_error(ER_SP_WRONG_NAME, MYF(0), $1.str); + YYABORT; + } $$= sp_name_current_db_new(YYTHD, $1); } ; |