diff options
| author | kostja@bodhi.local <> | 2006-12-12 01:50:12 +0300 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-12-12 01:50:12 +0300 |
| commit | 92f1c7623635adeeab08a58d83179e6b62a0b240 (patch) | |
| tree | 13f5570546702b83046f58c43a391f93191f3d5a /sql/sql_yacc.yy | |
| parent | 758404b238d6c3f25958c4716abac778e76d5722 (diff) | |
| download | mariadb-git-92f1c7623635adeeab08a58d83179e6b62a0b240.tar.gz | |
Post-merge fixes for Bug#4968 "Stored procedure crash if cursor opened
on altered table" and Bug#19733 "Repeated alter, or repeated
create/drop, fails"
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 719d48af33f..abaed88af57 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1190,7 +1190,6 @@ create: TL_OPTION_UPDATING)) YYABORT; lex->alter_info.reset(); - lex->alter_info.is_simple= 0; lex->alter_info.flags= ALTER_ADD_INDEX; lex->col_list.empty(); lex->change=NullS; @@ -3313,7 +3312,7 @@ alter: lex->create_info.db_type= DB_TYPE_DEFAULT; lex->create_info.default_table_charset= NULL; lex->create_info.row_type= ROW_TYPE_NOT_USED; - lex->alter_info.reset(); + lex->alter_info.reset(); } alter_list {} @@ -6076,7 +6075,6 @@ drop: LEX *lex=Lex; lex->sql_command= SQLCOM_DROP_INDEX; lex->alter_info.reset(); - lex->alter_info.is_simple= 0; lex->alter_info.flags= ALTER_DROP_INDEX; lex->alter_info.drop_list.push_back(new Alter_drop(Alter_drop::KEY, $3.str)); |