diff options
| author | unknown <mhansson@dl145s.mysql.com> | 2007-09-03 12:44:17 +0200 |
|---|---|---|
| committer | unknown <mhansson@dl145s.mysql.com> | 2007-09-03 12:44:17 +0200 |
| commit | 403ed43b1d338e7e7b845546178cac2e3334e1e2 (patch) | |
| tree | ca7d39e41e3f2c8f6b425fa210e5d6281c97b07d /sql | |
| parent | ee0b7d895d42b0e3c93bdbffa7c4d3f51c1f60c2 (diff) | |
| parent | f0d4beee7925035658a9ed4e48b826f699c31b7a (diff) | |
| download | mariadb-git-403ed43b1d338e7e7b845546178cac2e3334e1e2.tar.gz | |
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into dl145s.mysql.com:/data0/mhansson/my50-bug30234-push
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index a53cadafda8..d9a4d6bddef 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1159,7 +1159,8 @@ 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 opt_option opt_place + opt_outer table_list table_name table_alias_ref_list table_alias_ref + 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 @@ -6504,6 +6505,20 @@ 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; } @@ -6774,7 +6789,7 @@ single_multi: if (multi_delete_set_locks_and_link_aux_tables(Lex)) MYSQL_YYABORT; } - | FROM table_wild_list + | FROM table_alias_ref_list { mysql_init_multi_delete(Lex); } USING join_table_list where_clause { |