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

MDEV-7142: main.index_merge_innodb fails sporadically in buildbot

Browse Source 
Attempt to stabilize the testcase.
This commit is contained in:
Sergei Petrunia 2016-09-05 12:28:35 +03:00
parent f81f985f37
commit a14f61ef74
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/index_merge2.inc
View File

@ -341,6 +341,7 @@ while ($1)
alter table t1 add index i2(key2); alter table t1 add index i2(key2);
alter table t1 add index i3(key3); alter table t1 add index i3(key3);
update t1 set key2=key1,key3=key1; update t1 set key2=key1,key3=key1;
analyze table t1;
# to test the bug, the following must use "sort_union": # to test the bug, the following must use "sort_union":
--replace_column 9 REF --replace_column 9 REF

3
mysql-test/r/index_merge_innodb.result
View File

@ -311,6 +311,9 @@ set @d=@d*2;
alter table t1 add index i2(key2); alter table t1 add index i2(key2);
alter table t1 add index i3(key3); alter table t1 add index i3(key3);
update t1 set key2=key1,key3=key1; update t1 set key2=key1,key3=key1;
analyze table t1;
Table Op Msg_type Msg_text
test.t1 analyze status OK
explain select * from t1 where (key3 > 30 and key3<35) or (key2 >32 and key2 < 40); explain select * from t1 where (key3 > 30 and key3<35) or (key2 >32 and key2 < 40);
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index_merge i2,i3 i3,i2 4,4 NULL REF Using sort_union(i3,i2); Using where 1 SIMPLE t1 index_merge i2,i3 i3,i2 4,4 NULL REF Using sort_union(i3,i2); Using where

3
mysql-test/r/index_merge_myisam.result
View File

@ -1146,6 +1146,9 @@ set @d=@d*2;
alter table t1 add index i2(key2); alter table t1 add index i2(key2);
alter table t1 add index i3(key3); alter table t1 add index i3(key3);
update t1 set key2=key1,key3=key1; update t1 set key2=key1,key3=key1;
analyze table t1;
Table Op Msg_type Msg_text
test.t1 analyze status OK
explain select * from t1 where (key3 > 30 and key3<35) or (key2 >32 and key2 < 40); explain select * from t1 where (key3 > 30 and key3<35) or (key2 >32 and key2 < 40);
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index_merge i2,i3 i3,i2 4,4 NULL REF Using sort_union(i3,i2); Using where 1 SIMPLE t1 index_merge i2,i3 i3,i2 4,4 NULL REF Using sort_union(i3,i2); Using where