diff options
| author | unknown <serg@serg.mylan> | 2005-12-06 18:21:46 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-12-06 18:21:46 +0100 |
| commit | 6b5b3f3a5421689ce81fce07e400f87d7c7d5be3 (patch) | |
| tree | 335750ee6cb7e950edfece964814d33b83851e8c /sql/sql_yacc.yy | |
| parent | 29eac312cda3bebddeb7f5ab7a2af6b81ea89205 (diff) | |
| parent | d7249025a0ed9e344c24cdd40e5dc2500ea33bd0 (diff) | |
| download | mariadb-git-6b5b3f3a5421689ce81fce07e400f87d7c7d5be3.tar.gz | |
Merge
mysql-test/r/sp-error.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
SCCS merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index fbcb3de7907..6cb85b93937 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3783,11 +3783,6 @@ optimize: OPTIMIZE opt_no_write_to_binlog table_or_tables { LEX *lex=Lex; - if (lex->sphead) - { - my_error(ER_SP_BADSTATEMENT, MYF(0), "OPTIMIZE TABLE"); - YYABORT; - } lex->sql_command = SQLCOM_OPTIMIZE; lex->no_write_to_binlog= $2; lex->check_opt.init(); |