Merge LP BUG#780386 5.2->5.3 (where other fix was present)

6 files changed, 111 insertions, 111 deletions

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index e9b794d36ec..da07e50f4f7 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -5379,6 +5379,25 @@ a
 SELECT a FROM t1 WHERE b <> ALL ( SELECT b FROM t1 GROUP BY b );
 a
 drop table t1;
+#
+# Fix of LP BUG#780386 (NULL left part with empty ALL subquery).
+#
+CREATE TABLE t1 ( f11 int) ;
+INSERT IGNORE INTO t1 VALUES (0),(0);
+CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
+INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
+DROP TABLE IF EXISTS t3;
+Warnings:
+Note	1051	Unknown table 't3'
+CREATE TABLE t3 ( f3 int) ;
+INSERT INTO t3 VALUES (0),(0);
+SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
+r
+NULL
+5
+NULL
+5
+DROP TABLE t1, t2, t3;
 End of 5.2 tests
 #
 # BUG#779885: Crash in eliminate_item_equal with materialization=on in
@@ -5402,25 +5421,6 @@ ON t2.f10 = t3.f10
 f1
 DROP TABLE t1,t2,t3;
 #
-# Fix of LP BUG#780386 (NULL left part with empty ALL subquery).
-#
-CREATE TABLE t1 ( f11 int) ;
-INSERT IGNORE INTO t1 VALUES (0),(0);
-CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
-INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
-DROP TABLE IF EXISTS t3;
-Warnings:
-Note	1051	Unknown table 't3'
-CREATE TABLE t3 ( f3 int) ;
-INSERT INTO t3 VALUES (0),(0);
-SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
-r
-NULL
-5
-NULL
-5
-DROP TABLE t1, t2, t3;
-#
 # BUG LP:813473: Wrong result with outer join + NOT IN subquery
 # This bug is a duplicate of Bug#11764086 whose test case is added below
 #
diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result
index 570a7b1e6a1..3a71ee07464 100644
--- a/mysql-test/r/subselect_no_mat.result
+++ b/mysql-test/r/subselect_no_mat.result
@@ -5384,6 +5384,25 @@ a
 SELECT a FROM t1 WHERE b <> ALL ( SELECT b FROM t1 GROUP BY b );
 a
 drop table t1;
+#
+# Fix of LP BUG#780386 (NULL left part with empty ALL subquery).
+#
+CREATE TABLE t1 ( f11 int) ;
+INSERT IGNORE INTO t1 VALUES (0),(0);
+CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
+INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
+DROP TABLE IF EXISTS t3;
+Warnings:
+Note	1051	Unknown table 't3'
+CREATE TABLE t3 ( f3 int) ;
+INSERT INTO t3 VALUES (0),(0);
+SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
+r
+NULL
+5
+NULL
+5
+DROP TABLE t1, t2, t3;
 End of 5.2 tests
 #
 # BUG#779885: Crash in eliminate_item_equal with materialization=on in
@@ -5407,25 +5426,6 @@ ON t2.f10 = t3.f10
 f1
 DROP TABLE t1,t2,t3;
 #
-# Fix of LP BUG#780386 (NULL left part with empty ALL subquery).
-#
-CREATE TABLE t1 ( f11 int) ;
-INSERT IGNORE INTO t1 VALUES (0),(0);
-CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
-INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
-DROP TABLE IF EXISTS t3;
-Warnings:
-Note	1051	Unknown table 't3'
-CREATE TABLE t3 ( f3 int) ;
-INSERT INTO t3 VALUES (0),(0);
-SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
-r
-NULL
-5
-NULL
-5
-DROP TABLE t1, t2, t3;
-#
 # BUG LP:813473: Wrong result with outer join + NOT IN subquery
 # This bug is a duplicate of Bug#11764086 whose test case is added below
 #
diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result
index 2a30a8b2457..956dcb233b0 100644
--- a/mysql-test/r/subselect_no_opts.result
+++ b/mysql-test/r/subselect_no_opts.result
@@ -5380,6 +5380,25 @@ a
 SELECT a FROM t1 WHERE b <> ALL ( SELECT b FROM t1 GROUP BY b );
 a
 drop table t1;
+#
+# Fix of LP BUG#780386 (NULL left part with empty ALL subquery).
+#
+CREATE TABLE t1 ( f11 int) ;
+INSERT IGNORE INTO t1 VALUES (0),(0);
+CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
+INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
+DROP TABLE IF EXISTS t3;
+Warnings:
+Note	1051	Unknown table 't3'
+CREATE TABLE t3 ( f3 int) ;
+INSERT INTO t3 VALUES (0),(0);
+SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
+r
+NULL
+5
+NULL
+5
+DROP TABLE t1, t2, t3;
 End of 5.2 tests
 #
 # BUG#779885: Crash in eliminate_item_equal with materialization=on in
@@ -5403,25 +5422,6 @@ ON t2.f10 = t3.f10
 f1
 DROP TABLE t1,t2,t3;
 #
-# Fix of LP BUG#780386 (NULL left part with empty ALL subquery).
-#
-CREATE TABLE t1 ( f11 int) ;
-INSERT IGNORE INTO t1 VALUES (0),(0);
-CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
-INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
-DROP TABLE IF EXISTS t3;
-Warnings:
-Note	1051	Unknown table 't3'
-CREATE TABLE t3 ( f3 int) ;
-INSERT INTO t3 VALUES (0),(0);
-SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
-r
-NULL
-5
-NULL
-5
-DROP TABLE t1, t2, t3;
-#
 # BUG LP:813473: Wrong result with outer join + NOT IN subquery
 # This bug is a duplicate of Bug#11764086 whose test case is added below
 #
diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result
index ed6b46e979d..878425ab6b6 100644
--- a/mysql-test/r/subselect_no_semijoin.result
+++ b/mysql-test/r/subselect_no_semijoin.result
@@ -5380,6 +5380,25 @@ a
 SELECT a FROM t1 WHERE b <> ALL ( SELECT b FROM t1 GROUP BY b );
 a
 drop table t1;
+#
+# Fix of LP BUG#780386 (NULL left part with empty ALL subquery).
+#
+CREATE TABLE t1 ( f11 int) ;
+INSERT IGNORE INTO t1 VALUES (0),(0);
+CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
+INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
+DROP TABLE IF EXISTS t3;
+Warnings:
+Note	1051	Unknown table 't3'
+CREATE TABLE t3 ( f3 int) ;
+INSERT INTO t3 VALUES (0),(0);
+SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
+r
+NULL
+5
+NULL
+5
+DROP TABLE t1, t2, t3;
 End of 5.2 tests
 #
 # BUG#779885: Crash in eliminate_item_equal with materialization=on in
@@ -5403,25 +5422,6 @@ ON t2.f10 = t3.f10
 f1
 DROP TABLE t1,t2,t3;
 #
-# Fix of LP BUG#780386 (NULL left part with empty ALL subquery).
-#
-CREATE TABLE t1 ( f11 int) ;
-INSERT IGNORE INTO t1 VALUES (0),(0);
-CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
-INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
-DROP TABLE IF EXISTS t3;
-Warnings:
-Note	1051	Unknown table 't3'
-CREATE TABLE t3 ( f3 int) ;
-INSERT INTO t3 VALUES (0),(0);
-SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
-r
-NULL
-5
-NULL
-5
-DROP TABLE t1, t2, t3;
-#
 # BUG LP:813473: Wrong result with outer join + NOT IN subquery
 # This bug is a duplicate of Bug#11764086 whose test case is added below
 #
diff --git a/mysql-test/r/subselect_scache.result b/mysql-test/r/subselect_scache.result
index 54011c581f9..597577cb58f 100644
--- a/mysql-test/r/subselect_scache.result
+++ b/mysql-test/r/subselect_scache.result
@@ -5383,6 +5383,25 @@ a
 SELECT a FROM t1 WHERE b <> ALL ( SELECT b FROM t1 GROUP BY b );
 a
 drop table t1;
+#
+# Fix of LP BUG#780386 (NULL left part with empty ALL subquery).
+#
+CREATE TABLE t1 ( f11 int) ;
+INSERT IGNORE INTO t1 VALUES (0),(0);
+CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
+INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
+DROP TABLE IF EXISTS t3;
+Warnings:
+Note	1051	Unknown table 't3'
+CREATE TABLE t3 ( f3 int) ;
+INSERT INTO t3 VALUES (0),(0);
+SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
+r
+NULL
+5
+NULL
+5
+DROP TABLE t1, t2, t3;
 End of 5.2 tests
 #
 # BUG#779885: Crash in eliminate_item_equal with materialization=on in
@@ -5406,25 +5425,6 @@ ON t2.f10 = t3.f10
 f1
 DROP TABLE t1,t2,t3;
 #
-# Fix of LP BUG#780386 (NULL left part with empty ALL subquery).
-#
-CREATE TABLE t1 ( f11 int) ;
-INSERT IGNORE INTO t1 VALUES (0),(0);
-CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
-INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
-DROP TABLE IF EXISTS t3;
-Warnings:
-Note	1051	Unknown table 't3'
-CREATE TABLE t3 ( f3 int) ;
-INSERT INTO t3 VALUES (0),(0);
-SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
-r
-NULL
-5
-NULL
-5
-DROP TABLE t1, t2, t3;
-#
 # BUG LP:813473: Wrong result with outer join + NOT IN subquery
 # This bug is a duplicate of Bug#11764086 whose test case is added below
 #
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index c635424eeab..4cbcd3505fd 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -4490,6 +4490,22 @@ SELECT a FROM t1 WHERE b <> ALL ( SELECT b FROM t1 GROUP BY b );
 
 drop table t1;
 
+--echo #
+--echo # Fix of LP BUG#780386 (NULL left part with empty ALL subquery).
+--echo #
+CREATE TABLE t1 ( f11 int) ;
+INSERT IGNORE INTO t1 VALUES (0),(0);
+
+CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
+INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
+
+DROP TABLE IF EXISTS t3;
+CREATE TABLE t3 ( f3 int) ;
+INSERT INTO t3 VALUES (0),(0);
+
+SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
+DROP TABLE t1, t2, t3;
+
 --echo End of 5.2 tests
 
 --echo #
@@ -4518,22 +4534,6 @@ WHERE
 DROP TABLE t1,t2,t3;
 
 --echo #
---echo # Fix of LP BUG#780386 (NULL left part with empty ALL subquery).
---echo #
-CREATE TABLE t1 ( f11 int) ;
-INSERT IGNORE INTO t1 VALUES (0),(0);
-
-CREATE TABLE t2 ( f3 int, f10 int, KEY (f10,f3)) ;
-INSERT IGNORE INTO t2 VALUES (NULL,NULL),(5,0);
-
-DROP TABLE IF EXISTS t3;
-CREATE TABLE t3 ( f3 int) ;
-INSERT INTO t3 VALUES (0),(0);
-
-SELECT a1.f3 AS r FROM t2 AS a1 , t1 WHERE a1.f3 < ALL ( SELECT f3 FROM t3 WHERE f3 = 1 ) ;
-DROP TABLE t1, t2, t3;
-
---echo #
 --echo # BUG LP:813473: Wrong result with outer join + NOT IN subquery
 --echo # This bug is a duplicate of Bug#11764086 whose test case is added below
 --echo #