Merge branch '10.3' into 10.4

1 files changed, 44 insertions, 1 deletions

diff --git a/mysql-test/main/subselect_innodb.test b/mysql-test/main/subselect_innodb.test
index 8ff3a5acf7d..fef954edc28 100644
--- a/mysql-test/main/subselect_innodb.test
+++ b/mysql-test/main/subselect_innodb.test
@@ -575,7 +575,7 @@ from
 drop table t1,t2;
 
 --echo #
---echo # mdev-12931: semi-join in ON expression of STRAIGHT_JOIN 
+--echo # MDEV-12931: semi-join in ON expression of STRAIGHT_JOIN 
 --echo #             joining a base table and a mergeable derived table
 --echo #
 
@@ -625,6 +625,49 @@ DROP TABLE t1,t2;
 
 set character_set_connection=@save_character_set_connection;
 
+--echo #
+--echo # MDEV-26047: MariaDB server crash at Item_subselect::init_expr_cache_tracker
+--echo #
+CREATE TABLE t1 (a int) engine=innodb;
+
+SELECT 1 IN (
+  SELECT NULL
+  FROM t1
+  WHERE
+    a IS NOT NULL
+  GROUP BY
+    (SELECT NULL from dual WHERE a = 1)
+);
+drop table t1;
+
+--echo # Testcase from MDEV-26164
+create table t1(a int);
+--echo # Disable the warning as it includes current time and changes for every test run.
+--disable_warnings
+select 1 from t1 where not exists
+(
+  select 1 from t1 where binary current_time()
+  group by (select a),(select 1)
+);
+--enable_warnings
+drop table t1;
+
+--echo #
+--echo # MDEV-28437: Assertion `!eliminated' failed in Item_subselect::exec
+--echo #
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (b INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (3),(4);
+ 
+SELECT 1 IN (SELECT a FROM t1 LEFT JOIN t2 ON (a = b AND EXISTS (SELECT * FROM t1)));
+
+drop table t1,t2;
+
+--echo #
+--echo # End of 10.2 tests
+--echo #
+
 --echo # 
 --echo # MDEV-17362: SIGSEGV in JOIN::optimize_inner or Assertion `fixed == 0'
 --echo # failed in  Item_equal::fix_fields, server crashes after 2nd execution