diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-08-06 13:33:18 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-08-06 13:33:18 -0700 |
| commit | f08946c0376cd2a116116685febe758ad5592741 (patch) | |
| tree | 3d664545b4d913d2dea62d58fc6b561e9afe6d9c /sql/sql_yacc.yy | |
| parent | 97e640b9ae83e07b444fceede6b0524256c7a3cc (diff) | |
| parent | 86d62605e88d0bee2c4b1970ae8320c11af078d6 (diff) | |
| download | mariadb-git-f08946c0376cd2a116116685febe758ad5592741.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index f3abc872587..a10612e7266 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1261,6 +1261,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %token RESTORE_SYM %token RESTRICT %token RESUME_SYM +%token RETURNING_SYM %token RETURNS_SYM /* SQL-2003-R */ %token RETURN_SYM /* SQL-2003-R */ %token REVOKE /* SQL-2003-R */ @@ -11428,6 +11429,7 @@ single_multi: } where_clause opt_order_clause delete_limit_clause {} + opt_select_expressions {} | table_wild_list { mysql_init_multi_delete(Lex); @@ -11452,6 +11454,11 @@ single_multi: } ; +opt_select_expressions: + /* empty */ + | RETURNING_SYM select_item_list + ; + table_wild_list: table_wild_one | table_wild_list ',' table_wild_one |