NULL merge of backport of Bug #46860 Crash/segfault ...

Then patch in the new test case for Bug#11829785 EXPLAIN EXTENDED CRASH ...

Author: Tor Didriksen

mysql-test/r/explain.result

@@ -443,4 +443,17 @@ Note	1003	select `test`.`t1`.`url` AS `url` from `test`.`t1` where (`test`.`t1`.
 
 DROP TABLE t1;
 # End BUG#53562
+#
+# Bug#11829785 EXPLAIN EXTENDED CRASH WITH RIGHT OUTER JOIN, SUBQUERIES
+#
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES (0), (0);
+PREPARE s FROM 
+'EXPLAIN EXTENDED
+SELECT SUBSTRING(1, (SELECT 1 FROM t1 a1 RIGHT OUTER JOIN t1 ON 0)) AS d
+FROM t1 WHERE 0 > ANY (SELECT @a FROM t1)';
+EXECUTE s;
+ERROR 21000: Subquery returns more than 1 row
+DEALLOCATE PREPARE s;
+DROP TABLE t1;
 End of 6.0 tests.

mysql-test/t/explain.test

@@ -354,4 +354,23 @@ DROP TABLE t1;
 
 --echo # End BUG#53562
 
+--echo #
+--echo # Bug#11829785 EXPLAIN EXTENDED CRASH WITH RIGHT OUTER JOIN, SUBQUERIES
+--echo #
+
+CREATE TABLE t1(a INT);
+
+INSERT INTO t1 VALUES (0), (0);
+
+PREPARE s FROM 
+'EXPLAIN EXTENDED
+SELECT SUBSTRING(1, (SELECT 1 FROM t1 a1 RIGHT OUTER JOIN t1 ON 0)) AS d
+FROM t1 WHERE 0 > ANY (SELECT @a FROM t1)';
+
+--error ER_SUBQUERY_NO_1_ROW
+EXECUTE s;
+
+DEALLOCATE PREPARE s;
+DROP TABLE t1;
+
 --echo End of 6.0 tests.