diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-12-09 21:55:14 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-12-09 21:55:14 -0800 |
| commit | c4080280dfb45e31d3e6936fe08f571d66a62ed9 (patch) | |
| tree | edd6c95f94663af654b856acb327213b3e408958 /mysql-test/r/index_merge_innodb.result | |
| parent | f960f2334dab6bef702a6f36e90dcdf6835588b6 (diff) | |
| parent | 3e946fa7ad833751e90d2263ca896d419c6a499d (diff) | |
| download | mariadb-git-c4080280dfb45e31d3e6936fe08f571d66a62ed9.tar.gz | |
Merge
Diffstat (limited to 'mysql-test/r/index_merge_innodb.result')
| -rw-r--r-- | mysql-test/r/index_merge_innodb.result | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/index_merge_innodb.result b/mysql-test/r/index_merge_innodb.result index fdc5b57a2e3..e8fda5b4655 100644 --- a/mysql-test/r/index_merge_innodb.result +++ b/mysql-test/r/index_merge_innodb.result @@ -1,3 +1,5 @@ +set @optimizer_switch_save= @@optimizer_switch; +set optimizer_switch='index_merge_sort_intersection=off'; #---------------- Index merge test 2 ------------------------------------------- SET SESSION STORAGE_ENGINE = InnoDB; drop table if exists t1,t2; @@ -709,3 +711,4 @@ WHERE a BETWEEN 2 AND 7 OR pk=1000000) AS t; COUNT(*) 6145 DROP TABLE t1; +set optimizer_switch= @optimizer_switch_save; |