bk commit into 5.0 tree (sergefp:1.2524) BUG#29740

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-14 22:02:10+04:00, sergefp@stripped +2 -0
  BUG#29740: Make the test result deterministic

  mysql-test/r/index_merge.result@stripped, 2007-07-14 22:02:07+04:00, sergefp@stripped +14
-14
    BUG#29740: Make the test result deterministic

  mysql-test/t/index_merge.test@stripped, 2007-07-14 22:02:07+04:00, sergefp@stripped +5 -0
    BUG#29740: Make the test result deterministic

diff -Nrup a/mysql-test/r/index_merge.result b/mysql-test/r/index_merge.result
--- a/mysql-test/r/index_merge.result	2007-07-13 19:13:36 +04:00
+++ b/mysql-test/r/index_merge.result	2007-07-14 22:02:07 +04:00
@@ -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;
diff -Nrup a/mysql-test/t/index_merge.test b/mysql-test/t/index_merge.test
--- a/mysql-test/t/index_merge.test	2007-07-13 19:13:36 +04:00
+++ b/mysql-test/t/index_merge.test	2007-07-14 22:02:07 +04:00
@@ -448,12 +448,17 @@ create table t2(
 insert into t2 select * from t1;
 
 --echo must use sort-union rather than union:
+--replace_column 9 #
 explain select * from t1 where a=4 or b=4;
+--sorted_result
 select * from t1 where a=4 or b=4;
+--sorted_result
 select * from t1 ignore index(a,b) where a=4 or b=4;
 
 --echo must use union, not sort-union:
+--replace_column 9 #
 explain select * from t2 where a=4 or b=4;
+--sorted_result
 select * from t2 where a=4 or b=4;
 
 drop table t1, t2;