Merge branch '10.1' into 10.2

1 files changed, 29 insertions, 4 deletions

diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index adaaf084a3d..8712519350d 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -1233,12 +1233,9 @@ a	b
 select * from ((select * from t1 limit 1) union (select * from t1 limit 1)) a;
 a	b
 1	a
-2	b
 select * from ((select * from t1 limit 1) union (select * from t1 limit 1) union (select * from t1 limit 1)) a;
 a	b
 1	a
-2	b
-3	c
 select * from ((((select * from t1))) union (select * from t1) union (select * from t1)) a;
 a	b
 1	a
@@ -1621,7 +1618,6 @@ NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using filesort
 Warnings:
 Note	1003	select NULL AS `a` from `test`.`t1` union select NULL AS `a` from `test`.`t1` order by `a`
 DROP TABLE t1;
-End of 5.0 tests
 #
 # Bug#32858: Error: "Incorrect usage of UNION and INTO" does not take 
 # subselects into account
@@ -1736,6 +1732,16 @@ a
 6
 7
 8
+(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;
 #
 # Bug#11765255 58201:
@@ -2031,6 +2037,25 @@ bbbb
 dddd
 drop table t1;
 #
+# MDEV-10172: UNION query returns incorrect rows outside
+# conditional evaluation
+#
+create table t1 (d datetime not null primary key);
+insert into t1(d) values ('2016-06-01'),('2016-06-02'),('2016-06-03'),('2016-06-04');
+select * from
+(
+select * from t1 where d between '2016-06-02' and '2016-06-05'
+	union
+(select * from t1 where d < '2016-06-05' order by d desc limit 1)
+) onlyJun2toJun4
+order by d;
+d
+2016-06-02 00:00:00
+2016-06-03 00:00:00
+2016-06-04 00:00:00
+drop table t1;
+End of 5.0 tests
+#
 # WL#1763 Avoid creating temporary table in UNION ALL
 #
 EXPLAIN SELECT 1 UNION ALL SELECT 1 LIMIT 1 OFFSET 1;