summaryrefslogtreecommitdiff
path: root/mysql-test/t/maria_mrr.test
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2011-07-08 18:46:47 +0400
committerSergey Petrunya <psergey@askmonty.org>2011-07-08 18:46:47 +0400
commit1492de8563ac6032481fe69189f4f1f1e14fe73b (patch)
tree297c4f43de79a2afc07279f9897965b8c7fd0ef9 /mysql-test/t/maria_mrr.test
parent4128ec48522534732d16a74cda006dc794748042 (diff)
downloadmariadb-git-1492de8563ac6032481fe69189f4f1f1e14fe73b.tar.gz
Set the default to be mrr=off,mrr_sort_keys=off:
- Set the default - Adjust the testcases so that 'new' tests are run with optimizations turned on. - Pull out relevant tests from "irrelevant" tests and run them with optimizations on. - Run range.test and innodb.test with both mrr=on and mrr=off
Diffstat (limited to 'mysql-test/t/maria_mrr.test')
-rw-r--r--mysql-test/t/maria_mrr.test5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/maria_mrr.test b/mysql-test/t/maria_mrr.test
index 233186fe5bd..939deac6bb7 100644
--- a/mysql-test/t/maria_mrr.test
+++ b/mysql-test/t/maria_mrr.test
@@ -7,6 +7,9 @@
drop table if exists t1,t2,t3,t4;
--enable_warnings
+set @maria_mrr_tmp=@@optimizer_switch;
+set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
+
set @mrr_buffer_size_save= @@mrr_buffer_size;
set @save_storage_engine= @@storage_engine;
@@ -201,4 +204,6 @@ WHERE
set join_cache_level=@_save_join_cache_level;
set join_buffer_size=@_save_join_buffer_size;
+set optimizer_switch=@maria_mrr_tmp;
+
drop table t1;