Commit 3a3a91ff authored by unknown's avatar unknown

lp:732124: PBXT result file updates that were forgotten when patch was pushed.

parent 7a3a8b41
...@@ -362,7 +362,7 @@ a ...@@ -362,7 +362,7 @@ a
2 2
select found_rows(); select found_rows();
found_rows() found_rows()
6 5
SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 100; SELECT SQL_CALC_FOUND_ROWS * FROM t1 UNION SELECT * FROM t2 LIMIT 100;
a a
1 1
...@@ -372,7 +372,7 @@ a ...@@ -372,7 +372,7 @@ a
5 5
select found_rows(); select found_rows();
found_rows() found_rows()
6 5
SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 100 UNION SELECT * FROM t2; SELECT SQL_CALC_FOUND_ROWS * FROM t1 LIMIT 100 UNION SELECT * FROM t2;
a a
1 1
...@@ -405,7 +405,7 @@ a ...@@ -405,7 +405,7 @@ a
4 4
select found_rows(); select found_rows();
found_rows() found_rows()
6 5
SELECT SQL_CALC_FOUND_ROWS * FROM t1 limit 2,2 UNION SELECT * FROM t2; SELECT SQL_CALC_FOUND_ROWS * FROM t1 limit 2,2 UNION SELECT * FROM t2;
a a
3 3
...@@ -1166,9 +1166,12 @@ a b ...@@ -1166,9 +1166,12 @@ a b
select * from ((select * from t1 limit 1) union (select * from t1 limit 1)) a; select * from ((select * from t1 limit 1) union (select * from t1 limit 1)) a;
a b a b
1 a 1 a
2 b
select * from ((select * from t1 limit 1) union (select * from t1 limit 1) union (select * from t1 limit 1)) a; select * from ((select * from t1 limit 1) union (select * from t1 limit 1) union (select * from t1 limit 1)) a;
a b a b
1 a 1 a
2 b
3 c
select * from ((((select * from t1))) union (select * from t1) union (select * from t1)) a; select * from ((((select * from t1))) union (select * from t1) union (select * from t1)) a;
a b a b
1 a 1 a
...@@ -1426,4 +1429,17 @@ select _utf8'12' union select _latin1'12345'; ...@@ -1426,4 +1429,17 @@ select _utf8'12' union select _latin1'12345';
12 12
12 12
12345 12345
create table t1 (a int);
insert into t1 values (10),(10),(10),(2),(3),(4),(5),(6),(7),(8),(9),(1),(10);
select a from t1 where false UNION select a from t1 limit 8;
a
10
2
3
4
5
6
7
8
drop table t1;
End of 5.0 tests End of 5.0 tests
...@@ -904,6 +904,15 @@ drop table t1, t2; ...@@ -904,6 +904,15 @@ drop table t1, t2;
# #
select _utf8'12' union select _latin1'12345'; select _utf8'12' union select _latin1'12345';
#
# lp:732124 union + limit returns wrong result
#
create table t1 (a int);
insert into t1 values (10),(10),(10),(2),(3),(4),(5),(6),(7),(8),(9),(1),(10);
--sorted_result
select a from t1 where false UNION select a from t1 limit 8;
drop table t1;
--disable_query_log --disable_query_log
drop database pbxt; drop database pbxt;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment