Corrected the test case of MDEV-25714 in order to have the same EXPLAIN output as in 10.3

2 files changed, 8 insertions, 0 deletions

diff --git a/mysql-test/main/derived_split_innodb.result b/mysql-test/main/derived_split_innodb.result
index 6119145105b..63db8c94dde 100644
--- a/mysql-test/main/derived_split_innodb.result
+++ b/mysql-test/main/derived_split_innodb.result
@@ -190,6 +190,8 @@ id int not null, itemid int not null, userid int not null, primary key (id),
 index idx1 (userid, itemid), index idx2 (itemid)
 ) engine innodb;
 insert into t3 values (1,1,1), (2,1,1), (3,2,1), (4,2,1), (5,3,1);
+set use_stat_tables='never';
+set optimizer_use_condition_selectivity=1;
 analyze table t1,t2,t3;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
@@ -235,4 +237,6 @@ id	itemid	id	id
 4	2	4	2
 drop table t1,t2,t3;
 set optimizer_switch='split_materialized=default';
+set use_stat_tables=default;
+set optimizer_use_condition_selectivity=default;
 # End of 10.3 tests
diff --git a/mysql-test/main/derived_split_innodb.test b/mysql-test/main/derived_split_innodb.test
index 6f33c71eede..22793b448da 100644
--- a/mysql-test/main/derived_split_innodb.test
+++ b/mysql-test/main/derived_split_innodb.test
@@ -166,6 +166,8 @@ create table t3 (
   index idx1 (userid, itemid), index idx2 (itemid)
 ) engine innodb;
 insert into t3 values (1,1,1), (2,1,1), (3,2,1), (4,2,1), (5,3,1);
+set use_stat_tables='never';
+set optimizer_use_condition_selectivity=1;
 analyze table t1,t2,t3;
 
 let $q=
@@ -185,5 +187,7 @@ eval $q;
 
 drop table t1,t2,t3;
 set optimizer_switch='split_materialized=default';
+set use_stat_tables=default;
+set optimizer_use_condition_selectivity=default;
 
 --echo # End of 10.3 tests