Commit a2174048 authored by unknown's avatar unknown
Browse files

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 

into sinisa.nasamreza.org:/mnt/work/mysql-4.1
parents 0a2b0725 2f9c6377

mysql-test/r/union.result

+19 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/union.test

+11 −0
Original line number Diff line number Diff line
@@ -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;

sql/sql_yacc.yy

+1 −1
Original line number Diff line number Diff line
@@ -2449,7 +2449,7 @@ select_part2: 
	select_into select_lock_type;



select_into:

	opt_limit_clause {}

	opt_order_clause opt_limit_clause {}

        | into

	| select_from

	| into select_from