diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-12-03 10:08:58 +0100 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-12-03 10:08:58 +0100 |
| commit | b4a146a6ebe0ad14d40f241c0a37c9a43c7fd7f3 (patch) | |
| tree | a648e40f505bf6112ce0fc16085b2c8e89628529 /sql/sql_yacc.yy | |
| parent | 62a7e160bc0e960ec1374a546dde4a7f26120ceb (diff) | |
| download | mariadb-git-b4a146a6ebe0ad14d40f241c0a37c9a43c7fd7f3.tar.gz | |
Bug#30234: Unexpected behavior using DELETE with AS and USING
Anti-patch. This patch undoes the previously pushed patch. It is
null-merged in versions 5.1 and above since there the original
patch is still desired.
mysql-test/r/delete.result:
Bug#30234: Anti-patch
mysql-test/t/delete.test:
Bug#30234: Anti-patch
sql/sql_yacc.yy:
Bug#30234: Anti-patch
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 82100b3d3dd..c4bc4616841 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1162,8 +1162,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); field_opt_list opt_binary table_lock_list table_lock ref_list opt_on_delete opt_on_delete_list opt_on_delete_item use opt_delete_options opt_delete_option varchar nchar nvarchar - opt_outer table_list table_name table_alias_ref_list table_alias_ref - opt_option opt_place + opt_outer table_list table_name opt_option opt_place opt_attribute opt_attribute_list attribute column_list column_list_id opt_column_list grant_privileges grant_ident grant_list grant_option object_privilege object_privilege_list user_list rename_list @@ -6554,20 +6553,6 @@ table_name: } ; -table_alias_ref_list: - table_alias_ref - | table_alias_ref_list ',' table_alias_ref; - -table_alias_ref: - table_ident - { - if (!Select->add_table_to_list(YYTHD, $1, NULL, - TL_OPTION_UPDATING | TL_OPTION_ALIAS, - Lex->lock_option )) - MYSQL_YYABORT; - } - ; - if_exists: /* empty */ { $$= 0; } | IF EXISTS { $$= 1; } @@ -6838,7 +6823,7 @@ single_multi: if (multi_delete_set_locks_and_link_aux_tables(Lex)) MYSQL_YYABORT; } - | FROM table_alias_ref_list + | FROM table_wild_list { mysql_init_multi_delete(Lex); } USING join_table_list where_clause { |