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

1 files changed, 3 insertions, 1 deletions

diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/r/select_jcl6.result
index 0f591570a99..06d8109f7ee 100644
--- a/mysql-test/r/select_jcl6.result
+++ b/mysql-test/r/select_jcl6.result
@@ -1,6 +1,7 @@
 set @save_optimizer_switch_jcl6=@@optimizer_switch;
 set @@optimizer_switch='semijoin_with_cache=on';
 set @@optimizer_switch='outer_join_with_cache=on';
+set @@optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
 set join_cache_level=6;
 show variables like 'join_cache_level';
 Variable_name	Value
@@ -4902,6 +4903,7 @@ INSERT INTO t3 VALUES
 (4,'z'), (3,'zzz'), (5,'zzzzz'), (3,'z'), (4,'zzz'), (3,'zzzz'),
 (9,'zzzzz'), (2,'zzz'), (1,'zzzz'), (9,'zzz'), (1,'zzzz'), (5,'zzzzz'),
 (4,'zzz'), (3,'zzzz'), (5,'zzzz'), (3,'zzz'), (4,'zz'), (3,'zzzzz');
+set @tmp= @@optimizer_switch;
 SET SESSION optimizer_switch='index_condition_pushdown=off';
 EXPLAIN SELECT * from t1,t2,t3 WHERE t3.a3=t1.a1 AND t2.a2=t1.a1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -4981,7 +4983,7 @@ a1	b1	a2	b2	a3	b3
 2	xx	2	y	2	zzzz
 2	xx	2	yy	2	zz
 2	xx	2	yy	2	zzz
-SET SESSION optimizer_switch=DEFAULT;
+SET SESSION optimizer_switch=@tmp;
 DROP TABLE t1,t2,t3;
 #
 # Bug #707555: crash with equality substitution in ref