diff options
| author | jonas@perch.ndb.mysql.com <> | 2005-09-20 09:50:10 +0200 |
|---|---|---|
| committer | jonas@perch.ndb.mysql.com <> | 2005-09-20 09:50:10 +0200 |
| commit | 8983e39070aa2919e5a959e9c21316c5f072915f (patch) | |
| tree | f1a14e96cb63aef610fe5518ac764a93d26261f2 /sql/sql_yacc.yy | |
| parent | 992620318c5c10abacdbb7446cc5bd5ac3ca1137 (diff) | |
| parent | c4f16269f3eae72ff6c3300b0c91c160bc44b53f (diff) | |
| download | mariadb-git-8983e39070aa2919e5a959e9c21316c5f072915f.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 57a06943454..670e9a9bcb4 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4295,12 +4295,10 @@ single_multi: } where_clause opt_order_clause delete_limit_clause {} - | table_wild_list - { mysql_init_multi_delete(Lex); } - FROM join_table_list where_clause - | FROM table_wild_list - { mysql_init_multi_delete(Lex); } - USING join_table_list where_clause + | table_wild_list {mysql_init_multi_delete(Lex);} + FROM join_table_list {fix_multi_delete_lex(Lex);} where_clause + | FROM table_wild_list { mysql_init_multi_delete(Lex);} + USING join_table_list {fix_multi_delete_lex(Lex);} where_clause {} ; |