database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2005-05-18 15:28:13 +03:00
parent fce1521033 783705fc65
commit 2f9c6377f0
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mysql-test/r/union.result
View File

@ -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;

11
mysql-test/t/union.test
View File

@ -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;

2
sql/sql_yacc.yy
View File

@ -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