summaryrefslogtreecommitdiff
path: root/mysql-test/t/subselect_innodb.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/subselect_innodb.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/subselect_innodb.test')
-rw-r--r--mysql-test/t/subselect_innodb.test5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/subselect_innodb.test b/mysql-test/t/subselect_innodb.test
index 573fe0c1810..da7524c1427 100644
--- a/mysql-test/t/subselect_innodb.test
+++ b/mysql-test/t/subselect_innodb.test
@@ -1,5 +1,7 @@
-- source include/have_innodb.inc
+set @subselect_innodb_tmp=@@optimizer_switch;
+set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
--disable_warnings
drop table if exists t1,t2,t3;
--enable_warnings
@@ -238,3 +240,6 @@ call p1();
call p1();
drop procedure p1;
drop tables t1,t2,t3;
+
+set optimizer_switch=@subselect_innodb_tmp;
+