summaryrefslogtreecommitdiff
path: root/mysql-test/r/index_merge_myisam.result
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-09-10 17:26:54 +0300
committerMichael Widenius <monty@askmonty.org>2012-09-10 17:26:54 +0300
commit6f94b5c76d51e655d36198d177972caa18089e31 (patch)
tree58d5969a4e7682aab5219f0a20597b72e2ba89c0 /mysql-test/r/index_merge_myisam.result
parent1539f91267a8ca11b137444a4cb87c61febfb05c (diff)
downloadmariadb-git-6f94b5c76d51e655d36198d177972caa18089e31.tar.gz
Fixed random test failure
mysql-test/include/index_merge2.inc: InnoDB did report 9 or 7 rows in explain
Diffstat (limited to 'mysql-test/r/index_merge_myisam.result')
-rw-r--r--mysql-test/r/index_merge_myisam.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/index_merge_myisam.result b/mysql-test/r/index_merge_myisam.result
index bf151a872cf..0b6959d15a9 100644
--- a/mysql-test/r/index_merge_myisam.result
+++ b/mysql-test/r/index_merge_myisam.result
@@ -1146,7 +1146,7 @@ alter table t1 add index i3(key3);
update t1 set key2=key1,key3=key1;
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
-1 SIMPLE t1 index_merge i2,i3 i3,i2 4,4 NULL 11 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
select * from t1 where (key3 > 30 and key3<35) or (key2 >32 and key2 < 40);
key1 key2 key3
31 31 31