BUG#11754168 followup: trying to stabilize index_merge_innodb.test

Author: Jorgen Loland

mysql-test/include/index_merge1.inc

@@ -68,7 +68,7 @@ if ($index_merge_random_rows_in_EXPLAIN)
 {
   --replace_column 9 #
 }
-explain select * from t0 where key1 < 3 or key2 <4;
+explain select * from t0 where key1 < 3 or key2 <3;
 
 if ($index_merge_random_rows_in_EXPLAIN)
 {
@@ -96,7 +96,7 @@ if ($index_merge_random_rows_in_EXPLAIN)
 {
   --replace_column 9 #
 }
-explain select * from t0 use index (i1,i2) where (key1 < 3 or key2 <4) and key3 = 50;
+explain select * from t0 use index (i1,i2) where (key1 < 3 or key2 <3) and key3 = 50;
 
 if ($index_merge_random_rows_in_EXPLAIN)
 {
@@ -118,7 +118,7 @@ if ($index_merge_random_rows_in_EXPLAIN)
 }
 explain
   select * from t0 where key1<3 or key2<3 or (key1>5 and key1<8) or
-  (key1>10 and key1<12) or (key2>100 and key2<110);
+  (key1>10 and key1<12) or (key2>100 and key2<105);
 
 # 5. Check index_merge with conjuncts that are always true/false
 #    verify fallback to "range" if there is only one non-confluent condition
@@ -160,7 +160,7 @@ if ($index_merge_random_rows_in_EXPLAIN)
 {
   --replace_column 9 #
 }
-explain select key1 from t0 where (key1 <=> null) or (key2 < 5) or
+explain select key1 from t0 where (key1 <=> null) or (key2 < 3) or
                                    (key3=10) or (key4 <=> null);
 
 if ($index_merge_random_rows_in_EXPLAIN)
@@ -176,32 +176,32 @@ if ($index_merge_random_rows_in_EXPLAIN)
   --replace_column 9 #
 }
 explain select * from t0 where
-  (key1 < 3 or key2 < 3) and (key3 < 4 or key4 < 4) and (key5 < 5 or key6 < 5);
+  (key1 < 3 or key2 < 3) and (key3 < 3 or key4 < 3) and (key5 < 5 or key6 < 5);
 
 if ($index_merge_random_rows_in_EXPLAIN)
 {
   --replace_column 9 #
 }
 explain
-select * from t0 where (key1 < 3 or key2 < 6) and (key1 < 7 or key3 < 4);
+select * from t0 where (key1 < 3 or key2 < 5) and (key1 < 5 or key3 < 3);
 
-select * from t0 where (key1 < 3 or key2 < 6) and (key1 < 7 or key3 < 4);
+select * from t0 where (key1 < 3 or key2 < 5) and (key1 < 5 or key3 < 3);
 
 
 if ($index_merge_random_rows_in_EXPLAIN)
 {
   --replace_column 9 #
 }
 explain select * from t0 where
-  (key1 < 3 or key2 < 3) and (key3 < 4 or key4 < 4) and (key5 < 2 or key6 < 2);
+  (key1 < 3 or key2 < 3) and (key3 < 3 or key4 < 3) and (key5 < 2 or key6 < 2);
 
 #   now index_merge is not used at all when "range" is possible
 if ($index_merge_random_rows_in_EXPLAIN)
 {
   --replace_column 9 #
 }
 explain select * from t0 where
-  (key1 < 3 or key2 < 3) and (key3 < 100);
+  (key1 < 3 or key2 < 3) and (key3 < 90);
 
 #   this even can cause "all" scan:
 if ($index_merge_random_rows_in_EXPLAIN)
@@ -228,24 +228,24 @@ if ($index_merge_random_rows_in_EXPLAIN)
   --replace_column 9 #
 }
 explain select * from t0 where
-    ((key1 < 4 or key2 < 4) and (key2 <5 or key3 < 4))
+    ((key1 < 4 or key2 < 4) and (key2 <4 or key3 < 3))
   or
-    key1 < 7;
+    key1 < 5;
 
 select * from t0 where
-    ((key1 < 4 or key2 < 4) and (key2 <5 or key3 < 4))
+    ((key1 < 4 or key2 < 4) and (key2 <4 or key3 < 3))
   or
-    key1 < 7;
+    key1 < 5;
 
 #   tree_or(List<SEL_IMERGE>, List<SEL_IMERGE>).
 if ($index_merge_random_rows_in_EXPLAIN)
 {
   --replace_column 9 #
 }
 explain select * from t0 where
-    ((key1 < 4 or key2 < 4) and (key3 <5 or key5 < 4))
+    ((key1 < 3 or key2 < 3) and (key3 <4 or key5 < 4))
   or
-    ((key5 < 5 or key6 < 6) and (key7 <7 or key8 < 4));
+    ((key5 < 5 or key6 < 5) and (key7 <5 or key8 < 3));
 
 if ($index_merge_random_rows_in_EXPLAIN)
 {
@@ -270,9 +270,9 @@ if ($index_merge_random_rows_in_EXPLAIN)
   --replace_column 9 #
 }
 explain select * from t0 where
-    ((key3 <5 or key5 < 4) and (key1 < 4 or key2 < 4))
+    ((key3 <4 or key5 < 3) and (key1 < 3 or key2 < 3))
   or
-    (((key3 <7 and key7 < 6) or key5 < 2) and (key5 < 5 or key6 < 6));
+    (((key3 <5 and key7 < 5) or key5 < 2) and (key5 < 4 or key6 < 4));
 
 if ($index_merge_random_rows_in_EXPLAIN)
 {
@@ -303,14 +303,14 @@ explain select * from t0 force index(i1, i2, i3, i4, i5, i6 ) where
     ((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
 
 # 8. Verify that "order by" after index merge uses filesort
-select * from t0 where key1 < 5 or key8 < 4 order by key1;
+select * from t0 where key1 < 4 or key8 < 3 order by key1;
 
 if ($index_merge_random_rows_in_EXPLAIN)
 {
   --replace_column 9 #
 }
 explain
-select * from t0 where key1 < 5 or key8 < 4 order by key1;
+select * from t0 where key1 < 4 or key8 < 3 order by key1;
 
 # 9. Check that index_merge cost is compared to 'index' where possible
 create table t2 like t0;
@@ -476,6 +476,10 @@ select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4
   and   (B.key1 < 500000 or B.key2 < 3);
 
 update t0 set key1=1;
+if ($index_merge_random_rows_in_EXPLAIN)
+{
+  --replace_column 9 #
+}
 explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
  from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
   where (A.key1 = 1 or A.key2 = 1)
@@ -492,16 +496,15 @@ update t0 set key2=1, key3=1, key4=1, key5=1,key6=1,key7=1 where key7 < 500;
 # The next query will not use index i7 in intersection if the OS doesn't
 # support file sizes > 2GB. (ha_myisam::ref_length depends on this and index
 # scan cost estimates depend on ha_myisam::ref_length)
---replace_column 9 #
---replace_result "4,4,4,4,4,4,4" X "4,4,4,4,4,4" X "i6,i7" "i6,i7?" "i6" "i6,i7?"
-explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
- from t0 as A, t0 as B
- where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1 and A.key7 = 1 or A.key8=1)
-  and (B.key1 = 1 and B.key2 = 1 and B.key3 = 1 and B.key4=1 and B.key5=1 and B.key6=1 and B.key7 = 1 or B.key8=1);
-
-if ($index_merge_random_rows_in_EXPLAIN)
+if (!$index_merge_random_rows_in_EXPLAIN)
 {
+  # Too unstable for innodb
   --replace_column 9 #
+  --replace_result "4,4,4,4,4,4,4" X "4,4,4,4,4,4" X "i6,i7" "i6,i7?" "i6" "i6,i7?"
+  explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
+   from t0 as A, t0 as B
+   where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1 and A.key7 = 1 or A.key8=1)
+    and (B.key1 = 1 and B.key2 = 1 and B.key3 = 1 and B.key4=1 and B.key5=1 and B.key6=1 and B.key7 = 1 or B.key8=1);
 }
 select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
  from t0 as A, t0 as B

mysql-test/r/index_merge_innodb.result

@@ -32,7 +32,7 @@ key1	key2	key3	key4	key5	key6	key7	key8
 1022	1022	1022	1022	1022	1022	1022	2
 1023	1023	1023	1023	1023	1023	1023	1
 1024	1024	1024	1024	1024	1024	1024	0
-explain select * from t0 where key1 < 3 or key2 <4;
+explain select * from t0 where key1 < 3 or key2 <3;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2	NULL	NULL	NULL	#	Using where
 explain
@@ -56,7 +56,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 explain select * from t0 where (key1 < 3 or key2 <4) and key3 = 50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ref	i1,i2,i3	i3	4	const	#	Using where
-explain select * from t0 use index (i1,i2) where (key1 < 3 or key2 <4) and key3 = 50;
+explain select * from t0 use index (i1,i2) where (key1 < 3 or key2 <3) and key3 = 50;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2	NULL	NULL	NULL	#	Using where
 explain select * from t0 where (key1 > 1 or key2  > 2);
@@ -67,7 +67,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	index_merge	i1,i2	i1,i2	4,4	NULL	#	Using sort_union(i1,i2); Using where
 explain
 select * from t0 where key1<3 or key2<3 or (key1>5 and key1<8) or
-(key1>10 and key1<12) or (key2>100 and key2<110);
+(key1>10 and key1<12) or (key2>100 and key2<105);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2	NULL	NULL	NULL	#	Using where
 explain select * from t0 where key2 = 45 or key1 <=> null;
@@ -85,7 +85,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 explain select * from t0 where key2=10 or key3=3 or key4 is null;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	index_merge	i2,i3	i2,i3	4,4	NULL	#	Using union(i2,i3); Using where
-explain select key1 from t0 where (key1 <=> null) or (key2 < 5) or
+explain select key1 from t0 where (key1 <=> null) or (key2 < 3) or
 (key3=10) or (key4 <=> null);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2,i3,i4	NULL	NULL	NULL	#	Using where
@@ -94,26 +94,25 @@ explain select key1 from t0 where (key1 <=> null) or (key1 < 5) or
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	index_merge	i1,i3,i4	i1,i3	4,4	NULL	#	Using sort_union(i1,i3); Using where
 explain select * from t0 where
-(key1 < 3 or key2 < 3) and (key3 < 4 or key4 < 4) and (key5 < 5 or key6 < 5);
+(key1 < 3 or key2 < 3) and (key3 < 3 or key4 < 3) and (key5 < 5 or key6 < 5);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2,i3,i4,i5,i6	NULL	NULL	NULL	#	Using where
 explain
-select * from t0 where (key1 < 3 or key2 < 6) and (key1 < 7 or key3 < 4);
+select * from t0 where (key1 < 3 or key2 < 5) and (key1 < 5 or key3 < 3);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2,i3	NULL	NULL	NULL	#	Using where
-select * from t0 where (key1 < 3 or key2 < 6) and (key1 < 7 or key3 < 4);
+select * from t0 where (key1 < 3 or key2 < 5) and (key1 < 5 or key3 < 3);
 key1	key2	key3	key4	key5	key6	key7	key8
 1	1	1	1	1	1	1	1023
 2	2	2	2	2	2	2	1022
 3	3	3	3	3	3	3	1021
 4	4	4	4	4	4	4	1020
-5	5	5	5	5	5	5	1019
 explain select * from t0 where
-(key1 < 3 or key2 < 3) and (key3 < 4 or key4 < 4) and (key5 < 2 or key6 < 2);
+(key1 < 3 or key2 < 3) and (key3 < 3 or key4 < 3) and (key5 < 2 or key6 < 2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2,i3,i4,i5,i6	NULL	NULL	NULL	#	Using where
 explain select * from t0 where
-(key1 < 3 or key2 < 3) and (key3 < 100);
+(key1 < 3 or key2 < 3) and (key3 < 90);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2,i3	NULL	NULL	NULL	#	Using where
 explain select * from t0 where
@@ -127,26 +126,24 @@ key2 > 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2,i3	NULL	NULL	NULL	#	Using where
 explain select * from t0 where
-((key1 < 4 or key2 < 4) and (key2 <5 or key3 < 4))
+((key1 < 4 or key2 < 4) and (key2 <4 or key3 < 3))
 or
-key1 < 7;
+key1 < 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2,i3	NULL	NULL	NULL	#	Using where
 select * from t0 where
-((key1 < 4 or key2 < 4) and (key2 <5 or key3 < 4))
+((key1 < 4 or key2 < 4) and (key2 <4 or key3 < 3))
 or
-key1 < 7;
+key1 < 5;
 key1	key2	key3	key4	key5	key6	key7	key8
 1	1	1	1	1	1	1	1023
 2	2	2	2	2	2	2	1022
 3	3	3	3	3	3	3	1021
 4	4	4	4	4	4	4	1020
-5	5	5	5	5	5	5	1019
-6	6	6	6	6	6	6	1018
 explain select * from t0 where
-((key1 < 4 or key2 < 4) and (key3 <5 or key5 < 4))
+((key1 < 3 or key2 < 3) and (key3 <4 or key5 < 4))
 or
-((key5 < 5 or key6 < 6) and (key7 <7 or key8 < 4));
+((key5 < 5 or key6 < 5) and (key7 <5 or key8 < 3));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2,i3,i5,i6,i7,i8	NULL	NULL	NULL	#	Using where
 explain select * from t0 where
@@ -162,9 +159,9 @@ or
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2,i3,i5,i6	NULL	NULL	NULL	#	Using where
 explain select * from t0 where
-((key3 <5 or key5 < 4) and (key1 < 4 or key2 < 4))
+((key3 <4 or key5 < 3) and (key1 < 3 or key2 < 3))
 or
-(((key3 <7 and key7 < 6) or key5 < 2) and (key5 < 5 or key6 < 6));
+(((key3 <5 and key7 < 5) or key5 < 2) and (key5 < 4 or key6 < 4));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2,i3,i5,i6,i7	NULL	NULL	NULL	#	Using where
 explain select * from t0 where
@@ -185,18 +182,16 @@ or
 ((key3 >=5 or key5 < 2) and (key5 < 5 or key6 < 6));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i2,i3,i5,i6	NULL	NULL	NULL	#	Using where
-select * from t0 where key1 < 5 or key8 < 4 order by key1;
+select * from t0 where key1 < 4 or key8 < 3 order by key1;
 key1	key2	key3	key4	key5	key6	key7	key8
 1	1	1	1	1	1	1	1023
 2	2	2	2	2	2	2	1022
 3	3	3	3	3	3	3	1021
-4	4	4	4	4	4	4	1020
-1021	1021	1021	1021	1021	1021	1021	3
 1022	1022	1022	1022	1022	1022	1022	2
 1023	1023	1023	1023	1023	1023	1023	1
 1024	1024	1024	1024	1024	1024	1024	0
 explain
-select * from t0 where key1 < 5 or key8 < 4 order by key1;
+select * from t0 where key1 < 4 or key8 < 3 order by key1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t0	ALL	i1,i8	NULL	NULL	NULL	#	Using where; Using filesort
 create table t2 like t0;
@@ -361,8 +356,8 @@ from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
 where (A.key1 = 1 or A.key2 = 1)
 and   (B.key1 = 1 or B.key2 = 1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	A	index_merge	i1,i2	i1,i2	4,4	NULL	1021	Using union(i1,i2); Using where
-1	SIMPLE	B	index_merge	i1,i2	i1,i2	4,4	NULL	1021	Using union(i1,i2); Using where; Using join buffer (Block Nested Loop)
+1	SIMPLE	A	index_merge	i1,i2	i1,i2	4,4	NULL	#	Using union(i1,i2); Using where
+1	SIMPLE	B	index_merge	i1,i2	i1,i2	4,4	NULL	#	Using union(i1,i2); Using where; Using join buffer (Block Nested Loop)
 select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
 from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
 where (A.key1 = 1 or A.key2 = 1)
@@ -371,13 +366,6 @@ max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.ke
 8194
 alter table t0 add filler1 char(200), add filler2 char(200), add filler3 char(200);
 update t0 set key2=1, key3=1, key4=1, key5=1,key6=1,key7=1 where key7 < 500;
-explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
-from t0 as A, t0 as B
-where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1 and A.key7 = 1 or A.key8=1)
-and (B.key1 = 1 and B.key2 = 1 and B.key3 = 1 and B.key4=1 and B.key5=1 and B.key6=1 and B.key7 = 1 or B.key8=1);
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	A	index_merge	i1,i2,i3,i4,i5,i6,i7?,i8	i2,i8	4,4	NULL	#	Using union(i2,i8); Using where
-1	SIMPLE	B	index_merge	i1,i2,i3,i4,i5,i6,i7?,i8	i2,i8	4,4	NULL	#	Using union(i2,i8); Using where; Using join buffer (Block Nested Loop)
 select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
 from t0 as A, t0 as B
 where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1 and A.key7 = 1 or A.key8=1)