Make innodb_no_mrricp.test to really run with MRR and ICP turned OFF.

mysql-test/r/innodb_no_mrricp.result

 set @innodb_with_mrricp=@@optimizer_switch;
-set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
+set optimizer_switch='mrr=off,mrr_sort_keys=off,index_condition_pushdown=off';
 set @innodb_test_dont_touch_optimizer_switch=1;
 set @innodb_test_tmp=@@optimizer_switch;
 set optimizer_switch = 
@@ -1303,7 +1303,7 @@ count(*)
 623
 explain select * from t1 where c between 1 and 2500;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	c	c	5	NULL	#	Using index condition; Rowid-ordered scan
+1	SIMPLE	t1	range	c	c	5	NULL	#	Using where
 update t1 set c=a;
 explain select * from t1 where c between 1 and 2500;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -1998,7 +1998,7 @@ qq
 *a         *a*a         *
 explain select * from t1 where v='a';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v,v_2	#	13	const	#	Using index condition
+1	SIMPLE	t1	ref	v,v_2	#	13	const	#	Using where
 select v,count(*) from t1 group by v limit 10;
 v	count(*)
 a
	1
@@ -2174,7 +2174,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	v	v	303	const	#	Using where; Using index
 explain select * from t1 where v='a';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	303	const	#	Using index condition
+1	SIMPLE	t1	ref	v	v	303	const	#	Using where
 select v,count(*) from t1 group by v limit 10;
 v	count(*)
 a
	1

mysql-test/t/innodb_no_mrricp.test

 
 set @innodb_with_mrricp=@@optimizer_switch;
-set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
+set optimizer_switch='mrr=off,mrr_sort_keys=off,index_condition_pushdown=off';
 set @innodb_test_dont_touch_optimizer_switch=1;
 
 --source t/innodb.test