database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Make innodb_plugin testsuite not to use IndexConditionPushdown or DS-MRR

Browse Source 
(Otherwise we get different EXPLAINs for xtradb and innodb plugin).
This commit is contained in:
Sergey Petrunya
2010-10-18 16:23:05 +04:00
parent 6765cc3017
commit 851b2c3a02
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,5 @@
set optimizer_switch='index_condition_pushdown=off';
set @@optimizer_use_mrr=disable;
drop table if exists t1,t2,t3,t4;
drop database if exists mysqltest;
create table t1 (id int unsigned not null auto_increment, code tinyint unsigned not null, name char(20) not null, primary key (id), key (code), unique (name)) engine=innodb;
@ -1222,7 +1224,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; Using MRR
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
@ -1916,7 +1918,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
@ -2092,7 +2094,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
@ -3239,3 +3241,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;

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

@ -19,6 +19,9 @@ 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;
# 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
@ -2543,6 +2546,9 @@ SET GLOBAL innodb_thread_concurrency = @innodb_thread_concurrency_orig;
-- enable_query_log
set optimizer_switch='index_condition_pushdown=default';
set @@optimizer_use_mrr=default;
#######################################################################
# #
# Please, DO NOT TOUCH this file as well as the innodb.result file. #