More changes from optimizer_use_mrr to optimizer_switch

mysql-test/suite/innodb_plugin/r/innodb.result

-set optimizer_switch='index_condition_pushdown=off';
-set @@optimizer_use_mrr=disable;
+set optimizer_switch='index_condition_pushdown=off,mrr=off';
 drop table if exists t1,t2,t3,t4;
 drop database if exists mysqltest;
 CREATE TABLE bug58912 (a BLOB, b TEXT, PRIMARY KEY(a(1))) ENGINE=InnoDB;
@@ -3244,6 +3243,5 @@ Variable_name	Value
 Handler_update	1
 Variable_name	Value
 Handler_delete	1
-set optimizer_switch='index_condition_pushdown=default';
-set @@optimizer_use_mrr=default;
+set optimizer_switch=default;
 DROP TABLE bug58912;

mysql-test/suite/innodb_plugin/t/innodb.test

@@ -19,8 +19,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
 let collation=utf8_unicode_ci;
 --source include/have_collation.inc
 
-set optimizer_switch='index_condition_pushdown=off';
-set @@optimizer_use_mrr=disable;
+set optimizer_switch='index_condition_pushdown=off,mrr=off';
 
 # Save the original values of some variables in order to be able to
 # estimate how much they have changed during the tests. Previously this
@@ -2555,8 +2554,7 @@ SET GLOBAL innodb_thread_concurrency = @innodb_thread_concurrency_orig;
 
 -- enable_query_log
 
-set optimizer_switch='index_condition_pushdown=default';
-set @@optimizer_use_mrr=default;
+set optimizer_switch=default;
 # Clean up after the Bug#55284/Bug#58912 test case.
 DROP TABLE bug58912;