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

2 files changed, 30 insertions, 0 deletions

diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index c140ecd26e1..b315ae9a3f5 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -1235,3 +1235,22 @@ show columns from t2;
 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;
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index b0446e1ea4a..ecd98428b5a 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -742,3 +742,14 @@ create table t2 select a from t1 union select c from t1;
 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;