Fix the testcase for MDEV-30693

spetrunia · spetrunia · commit f6cb93ba8d24 · 2023-03-20T14:08:54.000+03:00
diff --git a/mysql-test/main/selectivity_innodb.result b/mysql-test/main/selectivity_innodb.result
@@ -2329,7 +2329,7 @@ CREATE TABLE t1 (c INT KEY) ENGINE=InnoDB;
 SELECT * FROM (SELECT * FROM t1) a JOIN (SELECT * FROM (SELECT * FROM t1 GROUP BY c) d WHERE c>1) b ON a.c=b.c;
 c	c
 DROP TABLE t1;
-SET optimizer_use_condition_selectivity=1;
+SET optimizer_use_condition_selectivity=@tmp_oucs;
 #
 # End of 11.0 tests
 #
diff --git a/mysql-test/main/selectivity_innodb.test b/mysql-test/main/selectivity_innodb.test
@@ -289,7 +289,7 @@ set @tmp_oucs= @@optimizer_use_condition_selectivity;
 CREATE TABLE t1 (c INT KEY) ENGINE=InnoDB;
 SELECT * FROM (SELECT * FROM t1) a JOIN (SELECT * FROM (SELECT * FROM t1 GROUP BY c) d WHERE c>1) b ON a.c=b.c;
 DROP TABLE t1;
-SET optimizer_use_condition_selectivity=1;
+SET optimizer_use_condition_selectivity=@tmp_oucs;
 
 --echo #
 --echo # End of 11.0 tests

Original file line number	Diff line number	Diff line change
`@@ -2329,7 +2329,7 @@ CREATE TABLE t1 (c INT KEY) ENGINE=InnoDB;`
`2329`	`2329`	`SELECT * FROM (SELECT * FROM t1) a JOIN (SELECT * FROM (SELECT * FROM t1 GROUP BY c) d WHERE c>1) b ON a.c=b.c;`
`2330`	`2330`	`c c`
`2331`	`2331`	`DROP TABLE t1;`
`2332`		`-SET optimizer_use_condition_selectivity=1;`
	`2332`	`+SET optimizer_use_condition_selectivity=@tmp_oucs;`
`2333`	`2333`	`#`
`2334`	`2334`	`# End of 11.0 tests`
`2335`	`2335`	`#`