diff options
Diffstat (limited to 'mysql-test/t/innodb.test')
| -rw-r--r-- | mysql-test/t/innodb.test | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test index 2c9f84e823a..49e535aad53 100644 --- a/mysql-test/t/innodb.test +++ b/mysql-test/t/innodb.test @@ -15,6 +15,12 @@ -- source include/have_innodb.inc +set @innodb_test_tmp=@@optimizer_switch; +set optimizer_switch = + if(@innodb_test_dont_touch_optimizer_switch, + @@optimizer_switch, + 'mrr=on,mrr_sort_keys=on,index_condition_pushdown=on'); + # Save the original values of some variables in order to be able to # estimate how much they have changed during the tests. Previously this # test assumed that e.g. rows_deleted is 0 here and after deleting 23 @@ -2549,6 +2555,8 @@ SET GLOBAL innodb_thread_concurrency = @innodb_thread_concurrency_orig; -- enable_query_log +set optimizer_switch=@innodb_test_tmp; + ####################################################################### # # # Please, DO NOT TOUCH this file as well as the innodb.result file. # |