diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-06-03 13:42:02 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-06-03 13:42:02 +0400 |
| commit | 80e14ddb88636e6e96b86786a15ece7f1bd464af (patch) | |
| tree | b3c147cf5d2595f4e7cdd181b42ee9736e0c183f | |
| parent | 40acadc779ff6ea2732209d3ab3017f4475019fa (diff) | |
| download | mariadb-git-80e14ddb88636e6e96b86786a15ece7f1bd464af.tar.gz | |
More changes from optimizer_use_mrr to optimizer_switch
| -rw-r--r-- | mysql-test/suite/innodb_plugin/r/innodb.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_plugin/t/innodb.test | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/mysql-test/suite/innodb_plugin/r/innodb.result b/mysql-test/suite/innodb_plugin/r/innodb.result index bff1b0c440e..20c90a9f440 100644 --- a/mysql-test/suite/innodb_plugin/r/innodb.result +++ b/mysql-test/suite/innodb_plugin/r/innodb.result @@ -1,5 +1,4 @@ -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; diff --git a/mysql-test/suite/innodb_plugin/t/innodb.test b/mysql-test/suite/innodb_plugin/t/innodb.test index d3474f90805..47f765e63f6 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb.test +++ b/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; |