diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-06-25 11:02:17 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-06-25 11:02:17 -0600 |
| commit | 0f719e7407bbdb8399c1292d76e3c5a2cea71636 (patch) | |
| tree | 0dde65756ebd8c877d13b7de57f90661bda35c9b /sql/sql_yacc.yy | |
| parent | 36151ca356040aa197eaf54169e32a4e0a12c3b6 (diff) | |
| parent | ba7e22dbe4acab510c78e163f1993fbf569b6f2d (diff) | |
| download | mariadb-git-0f719e7407bbdb8399c1292d76e3c5a2cea71636.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
sql/Makefile.am:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 3babaa2aa7a..97e35d8c6ae 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -5169,7 +5169,14 @@ alter: } | ALTER view_algorithm definer { - Lex->create_view_mode= VIEW_ALTER; + LEX *lex= Lex; + + if (lex->sphead) + { + my_error(ER_SP_BADSTATEMENT, MYF(0), "ALTER VIEW"); + MYSQL_YYABORT; + } + lex->create_view_mode= VIEW_ALTER; } view_tail {} @@ -5181,6 +5188,12 @@ alter: */ { LEX *lex= Lex; + + if (lex->sphead) + { + my_error(ER_SP_BADSTATEMENT, MYF(0), "ALTER VIEW"); + MYSQL_YYABORT; + } lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED; lex->create_view_mode= VIEW_ALTER; } |