1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More changes from optimizer_use_mrr to optimizer_switch

Browse Source
This commit is contained in:
Sergey Petrunya 2011-06-03 13:42:02 +04:00
parent 40acadc779
commit 80e14ddb88
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/innodb_plugin/r/innodb.result
View File

@ -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;

6
mysql-test/suite/innodb_plugin/t/innodb.test
View File

@ -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;