bk commit into 4.1 tree (Sinisa:1.2207) BUG#10032

[sinisa]

Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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.2207 05/04/26 21:27:06 Sinisa@stripped +3 -0
  union.result:
    Results for the above test case
  union.test:
    A test case for bug #10032 involving UNION's and ORDER BY clause
  sql_yacc.yy:
    Fix for a bug #10032 involving a parser bug with UNION's and ORDER BY

  mysql-test/r/union.result
    1.90 05/04/26 21:25:15 Sinisa@stripped +19 -0
    Results for the above test case

  mysql-test/t/union.test
    1.84 05/04/26 21:24:51 Sinisa@stripped +11 -0
    A test case for bug #10032 involving UNION's and ORDER BY clause

  sql/sql_yacc.yy
    1.383 05/04/26 21:24:08 Sinisa@stripped +1 -1
    Fix for a bug #10032 involving a parser bug with UNION's and ORDER BY

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.382/sql/sql_yacc.yy	Sat Apr 16 01:10:29 2005
+++ 1.383/sql/sql_yacc.yy	Tue Apr 26 21:24:08 2005
@@ -2449,7 +2449,7 @@
 	select_into select_lock_type;
 
 select_into:
-	opt_limit_clause {}
+	opt_order_clause opt_limit_clause {}
         | into
 	| select_from
 	| into select_from

--- 1.89/mysql-test/r/union.result	Sun Apr 10 10:40:13 2005
+++ 1.90/mysql-test/r/union.result	Tue Apr 26 21:25:15 2005
@@ -1235,3 +1235,22 @@
 Field	Type	Null	Key	Default	Extra
 a	varchar(3)	YES		NULL	
 drop table t2, t1;
+create table t1 ( id int not null auto_increment, primary key (id), col1 int);
+insert into t1 (col1) values (2),(3),(4),(5),(6);
+select 99 union all select id from t1 order by 1;
+99
+1
+2
+3
+4
+5
+99
+select id from t1 union all select 99 order by 1;
+id
+1
+2
+3
+4
+5
+99
+drop table t1;

--- 1.83/mysql-test/t/union.test	Sun Apr 10 10:40:05 2005
+++ 1.84/mysql-test/t/union.test	Tue Apr 26 21:24:51 2005
@@ -742,3 +742,14 @@
 create table t2 select a from t1 union select b from t1;
 show columns from t2;
 drop table t2, t1;
+
+
+#
+# Bug #10032 Bug in parsing UNION with ORDER BY when one node does not use FROM
+#
+
+create table t1 ( id int not null auto_increment, primary key (id), col1 int);
+insert into t1 (col1) values (2),(3),(4),(5),(6);
+select 99 union all select id from t1 order by 1;
+select id from t1 union all select 99 order by 1;
+drop table t1;