diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-23 12:38:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-23 12:38:46 +0200 |
| commit | 9aa098c46b422149b0459e817a76aa058a7be08c (patch) | |
| tree | 963fad9d5107982e6f4492eb6832134f83d2b3a3 /mysql-test/main | |
| parent | 22392b36ee84f1c08495eb59ece87d8d1df337ef (diff) | |
| parent | 92772485b75045501fef4f26d0e6514e9042116b (diff) | |
| download | mariadb-git-9aa098c46b422149b0459e817a76aa058a7be08c.tar.gz | |
Merge 11.0 into 11.1
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/selectivity_innodb.result | 2 | ||||
| -rw-r--r-- | 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 |