summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2007-07-14 22:02:10 +0400
committerunknown <sergefp@mysql.com>2007-07-14 22:02:10 +0400
commit25545b4bfb56ed4581edddb47820f4c968bb1f1f (patch)
tree8ed09b2718ad29d77a50d21b95afbb4552772055 /mysql-test/r
parenta90ccb1baede6338b07793b7ee7c9758554fffaf (diff)
downloadmariadb-git-25545b4bfb56ed4581edddb47820f4c968bb1f1f.tar.gz
BUG#29740: Make the test result deterministic
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/index_merge.result28
1 files changed, 14 insertions, 14 deletions
diff --git a/mysql-test/r/index_merge.result b/mysql-test/r/index_merge.result
index c7e4ead9eeb..15aa636d740 100644
--- a/mysql-test/r/index_merge.result
+++ b/mysql-test/r/index_merge.result
@@ -483,36 +483,36 @@ insert into t2 select * from t1;
must use sort-union rather than union:
explain select * from t1 where a=4 or b=4;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t1 index_merge a,b a,b 5,5 NULL 4 Using sort_union(a,b); Using where
+1 SIMPLE t1 index_merge a,b a,b 5,5 NULL # Using sort_union(a,b); Using where
select * from t1 where a=4 or b=4;
a filler b
-4 zz 4
-5 qq 4
-4 filler 4
-4 qq 5
4 4 0
-4 filler 4
4 5 0
+4 filler 4
+4 filler 4
+4 qq 5
+4 zz 4
+5 qq 4
select * from t1 ignore index(a,b) where a=4 or b=4;
a filler b
+4 4 0
+4 5 0
4 filler 4
4 filler 4
-4 5 0
-4 4 0
4 qq 5
-5 qq 4
4 zz 4
+5 qq 4
must use union, not sort-union:
explain select * from t2 where a=4 or b=4;
id select_type table type possible_keys key key_len ref rows Extra
-1 SIMPLE t2 index_merge a,b a,b 5,5 NULL 7 Using union(a,b); Using where
+1 SIMPLE t2 index_merge a,b a,b 5,5 NULL # Using union(a,b); Using where
select * from t2 where a=4 or b=4;
a filler b
+4 4 0
4 5 0
-4 zz 4
-5 qq 4
4 filler 4
-4 qq 5
-4 4 0
4 filler 4
+4 qq 5
+4 zz 4
+5 qq 4
drop table t1, t2;