diff options
| author | unknown <thek@adventure.(none)> | 2007-06-22 15:39:34 +0200 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-06-22 15:39:34 +0200 |
| commit | 40315b491f6b2de4188d4a98b1f0b36325c9f4b0 (patch) | |
| tree | 6acd7da963bd21388397fa430b0251015f1dffaa /sql/sql_yacc.yy | |
| parent | 72253445131fa3033243a9b663f4d88af019c547 (diff) | |
| parent | 1eee6b138976188abf656e1c29246011efd1efa2 (diff) | |
| download | mariadb-git-40315b491f6b2de4188d4a98b1f0b36325c9f4b0.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug28846/my51-bug28846
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
mysql-test/t/sp-error.test:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.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 2fbb46c23fb..a5f5c8ff9d4 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; } |