7 files changed, 63 insertions, 6 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index ce38d6ee643..3fa7fef89b2 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -7174,8 +7174,15 @@ drop table t1,t2;
 CREATE TABLE t1 (f1 INT, KEY(f1)) ENGINE=MyISAM;
 INSERT t1 VALUES (4),(8);
 CREATE TABLE t2 (f2 INT, KEY(f2)) ENGINE=MyISAM;
-INSERT t2 VALUES (6),(9);
+INSERT t2 VALUES (6);
 SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
 (SELECT MAX(sq.f2) FROM t1)
 NULL
+#
+# Disable this query till MDEV-13399 is resolved
+#
+# INSERT t2 VALUES (9);
+# --error ER_SUBQUERY_NO_1_ROW
+# SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
+#
 drop table t1, t2;
diff --git a/mysql-test/r/subselect_no_exists_to_in.result b/mysql-test/r/subselect_no_exists_to_in.result
index 8bc3b8c6efb..818fdf6c335 100644
--- a/mysql-test/r/subselect_no_exists_to_in.result
+++ b/mysql-test/r/subselect_no_exists_to_in.result
@@ -7171,6 +7171,21 @@ SELECT ( SELECT MAX(f1) FROM t2 ) FROM t1;
 ERROR 21000: Subquery returns more than 1 row
 drop view v1;
 drop table t1,t2;
+CREATE TABLE t1 (f1 INT, KEY(f1)) ENGINE=MyISAM;
+INSERT t1 VALUES (4),(8);
+CREATE TABLE t2 (f2 INT, KEY(f2)) ENGINE=MyISAM;
+INSERT t2 VALUES (6);
+SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
+(SELECT MAX(sq.f2) FROM t1)
+NULL
+#
+# Disable this query till MDEV-13399 is resolved
+#
+# INSERT t2 VALUES (9);
+# --error ER_SUBQUERY_NO_1_ROW
+# SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
+#
+drop table t1, t2;
 set optimizer_switch=default;
 select @@optimizer_switch like '%exists_to_in=off%';
 @@optimizer_switch like '%exists_to_in=off%'
diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result
index 30dcf56c091..51e3c7066d4 100644
--- a/mysql-test/r/subselect_no_mat.result
+++ b/mysql-test/r/subselect_no_mat.result
@@ -7167,10 +7167,17 @@ drop table t1,t2;
 CREATE TABLE t1 (f1 INT, KEY(f1)) ENGINE=MyISAM;
 INSERT t1 VALUES (4),(8);
 CREATE TABLE t2 (f2 INT, KEY(f2)) ENGINE=MyISAM;
-INSERT t2 VALUES (6),(9);
+INSERT t2 VALUES (6);
 SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
 (SELECT MAX(sq.f2) FROM t1)
 NULL
+#
+# Disable this query till MDEV-13399 is resolved
+#
+# INSERT t2 VALUES (9);
+# --error ER_SUBQUERY_NO_1_ROW
+# SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
+#
 drop table t1, t2;
 set optimizer_switch=default;
 select @@optimizer_switch like '%materialization=on%';
diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result
index 62a304a0c74..4a26d641aa6 100644
--- a/mysql-test/r/subselect_no_opts.result
+++ b/mysql-test/r/subselect_no_opts.result
@@ -7165,9 +7165,16 @@ drop table t1,t2;
 CREATE TABLE t1 (f1 INT, KEY(f1)) ENGINE=MyISAM;
 INSERT t1 VALUES (4),(8);
 CREATE TABLE t2 (f2 INT, KEY(f2)) ENGINE=MyISAM;
-INSERT t2 VALUES (6),(9);
+INSERT t2 VALUES (6);
 SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
 (SELECT MAX(sq.f2) FROM t1)
 NULL
+#
+# Disable this query till MDEV-13399 is resolved
+#
+# INSERT t2 VALUES (9);
+# --error ER_SUBQUERY_NO_1_ROW
+# SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
+#
 drop table t1, t2;
 set @optimizer_switch_for_subselect_test=null;
diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result
index d9e3be284f0..39e6a8c26d1 100644
--- a/mysql-test/r/subselect_no_scache.result
+++ b/mysql-test/r/subselect_no_scache.result
@@ -7180,10 +7180,17 @@ drop table t1,t2;
 CREATE TABLE t1 (f1 INT, KEY(f1)) ENGINE=MyISAM;
 INSERT t1 VALUES (4),(8);
 CREATE TABLE t2 (f2 INT, KEY(f2)) ENGINE=MyISAM;
-INSERT t2 VALUES (6),(9);
+INSERT t2 VALUES (6);
 SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
 (SELECT MAX(sq.f2) FROM t1)
 NULL
+#
+# Disable this query till MDEV-13399 is resolved
+#
+# INSERT t2 VALUES (9);
+# --error ER_SUBQUERY_NO_1_ROW
+# SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
+#
 drop table t1, t2;
 set optimizer_switch=default;
 select @@optimizer_switch like '%subquery_cache=on%';
diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result
index 839d76ddd0b..6980969bb79 100644
--- a/mysql-test/r/subselect_no_semijoin.result
+++ b/mysql-test/r/subselect_no_semijoin.result
@@ -7165,10 +7165,17 @@ drop table t1,t2;
 CREATE TABLE t1 (f1 INT, KEY(f1)) ENGINE=MyISAM;
 INSERT t1 VALUES (4),(8);
 CREATE TABLE t2 (f2 INT, KEY(f2)) ENGINE=MyISAM;
-INSERT t2 VALUES (6),(9);
+INSERT t2 VALUES (6);
 SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
 (SELECT MAX(sq.f2) FROM t1)
 NULL
+#
+# Disable this query till MDEV-13399 is resolved
+#
+# INSERT t2 VALUES (9);
+# --error ER_SUBQUERY_NO_1_ROW
+# SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
+#
 drop table t1, t2;
 set @optimizer_switch_for_subselect_test=null;
 set @join_cache_level_for_subselect_test=NULL;
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index cdb278d9130..43373248834 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -6059,6 +6059,13 @@ drop table t1,t2;
 CREATE TABLE t1 (f1 INT, KEY(f1)) ENGINE=MyISAM;
 INSERT t1 VALUES (4),(8);
 CREATE TABLE t2 (f2 INT, KEY(f2)) ENGINE=MyISAM;
-INSERT t2 VALUES (6),(9);
+INSERT t2 VALUES (6);
 SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
+--echo #
+--echo # Disable this query till MDEV-13399 is resolved
+--echo #
+--echo # INSERT t2 VALUES (9);
+--echo # --error ER_SUBQUERY_NO_1_ROW
+--echo # SELECT (SELECT MAX(sq.f2) FROM t1) FROM (SELECT * FROM t2) AS sq WHERE f2 = 2;
+--echo #
 drop table t1, t2;