diff options
| author | unknown <antony@ltantony.mysql.com> | 2005-05-08 23:07:46 +0100 |
|---|---|---|
| committer | unknown <antony@ltantony.mysql.com> | 2005-05-08 23:07:46 +0100 |
| commit | cdfc786f693f83396d1588859ee698b27ad1a4f9 (patch) | |
| tree | 5c30a7d09806a8a6c625ef69ca3ee234e4bba117 /sql | |
| parent | 3e1dad411598662152dd5100c2fb88219a31634f (diff) | |
| parent | 3ac2df4e4c2366d4b30b3251590207a3d07f483d (diff) | |
| download | mariadb-git-cdfc786f693f83396d1588859ee698b27ad1a4f9.tar.gz | |
Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug8191
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 8c5c4d61d1d..68d08b353d9 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1537,9 +1537,10 @@ select_part2: select_into: limit_clause {} + | into | select_from - | opt_into select_from - | select_from opt_into; + | into select_from + | select_from into; select_from: FROM join_table_list where_clause group_clause having_clause opt_order_clause limit_clause procedure_clause; @@ -2507,7 +2508,7 @@ procedure_item: $2->set_name($1,(uint) ((char*) lex->tok_end - $1)); }; -opt_into: +into: INTO OUTFILE TEXT_STRING { THD *thd= current_thd; |