summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <antony@ltantony.mysql.com>2005-05-08 22:56:58 +0100
committerunknown <antony@ltantony.mysql.com>2005-05-08 22:56:58 +0100
commit3ac2df4e4c2366d4b30b3251590207a3d07f483d (patch)
tree10cc2644866c76b24f2a1d676cdec9c02762c378 /sql
parentede028b0638239f61812e3a0f226ca7adf451ed7 (diff)
downloadmariadb-git-3ac2df4e4c2366d4b30b3251590207a3d07f483d.tar.gz
Bug#8191 - SELECT INTO OUTFILE insists on FROM clause
Fix bug + include test case. Enable outfile tests. mysql-test/t/outfile.test: Reenable outfile tests Add test for Bug#8191 sql/sql_yacc.yy: Fix Bug#8191 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_yacc.yy7
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;