bk commit into 4.0 tree (acurtis:1.2079) BUG#8191

[antony]

Below is the list of changes that have just been committed into a local
4.0 repository of acurtis. When acurtis does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2079 05/03/09 23:41:52 acurtis@stripped +1 -0
  Bug#8191
    Amend grammar to permit INTO without FROM clause
    (backport from 4.1)

  sql/sql_yacc.yy
    1.235 05/03/09 23:41:45 acurtis@stripped +4 -3
    Bug#8191
      Amend grammar to permit INTO without FROM clause

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	acurtis
# Host:	pcgem.rdg.cyberkinetica.com
# Root:	/var/db/bk/work-acurtis/bug8191

--- 1.234/sql/sql_yacc.yy	2005-02-18 12:50:18 +00:00
+++ 1.235/sql/sql_yacc.yy	2005-03-09 23:41:45 +00:00
@@ -1538,9 +1538,10 @@
 
 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;
@@ -2508,7 +2509,7 @@
 	      $2->set_name($1,(uint) ((char*) lex->tok_end - $1));
 	  };
 
-opt_into:
+into:
 	INTO OUTFILE TEXT_STRING
 	{
 	  THD *thd= current_thd;