From f6cb93ba8d24c2e67d396c3dd9ef2b0bb3a3e665 Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Mon, 20 Mar 2023 14:08:54 +0300 Subject: Fix the testcase for MDEV-30693 --- mysql-test/main/selectivity_innodb.result | 2 +- mysql-test/main/selectivity_innodb.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/main/selectivity_innodb.result b/mysql-test/main/selectivity_innodb.result index 9d6ac0b61ba..03e5079eff0 100644 --- 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 index efdb3c1853b..f8ffca7309e 100644 --- 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 -- cgit v1.2.1