List:Commits« Previous MessageNext Message »
From:Alexander Nozdrin Date:June 19 2009 9:12am
Subject:bzr commit into mysql-5.4-bugfixing branch (alik:2803) Bug#45029
View as plain text  
#At file:///mnt/raid/alik/MySQL/bzr/bug45029/azalea-alik-bug45029/ based on revid:alik@stripped

 2803 Alexander Nozdrin	2009-06-19
      Bug#45029: fix test failures.

    modified:
      mysql-test/r/innodb.result
      mysql-test/r/innodb_mrr.result
      mysql-test/r/subselect_sj2_jcl6.result
=== modified file 'mysql-test/r/innodb.result'
--- a/mysql-test/r/innodb.result	2009-06-02 13:04:43 +0000
+++ b/mysql-test/r/innodb.result	2009-06-19 09:12:06 +0000
@@ -1280,7 +1280,7 @@ count(*)
 623
 explain select * from t1 where c between 1 and 2500;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	c	c	5	NULL	#	Using index condition; Using MRR
+1	SIMPLE	t1	range	c	c	5	NULL	#	Using where
 update t1 set c=a;
 explain select * from t1 where c between 1 and 2500;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -1973,7 +1973,7 @@ qq
 *a         *a*a         *
 explain select * from t1 where v='a';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v,v_2	#	13	const	#	Using index condition
+1	SIMPLE	t1	ref	v,v_2	#	13	const	#	Using where
 select v,count(*) from t1 group by v limit 10;
 v	count(*)
 a	1
@@ -2149,7 +2149,7 @@ id	select_type	table	type	possible_keys	
 1	SIMPLE	t1	ref	v	v	303	const	#	Using where; Using index
 explain select * from t1 where v='a';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	v	v	303	const	#	Using index condition
+1	SIMPLE	t1	ref	v	v	303	const	#	Using where
 select v,count(*) from t1 group by v limit 10;
 v	count(*)
 a	1

=== modified file 'mysql-test/r/innodb_mrr.result'
--- a/mysql-test/r/innodb_mrr.result	2009-01-25 16:59:07 +0000
+++ b/mysql-test/r/innodb_mrr.result	2009-06-19 09:12:06 +0000
@@ -24,37 +24,37 @@ a	filler
 select a,filler from t3 where a >= 'c-1011=w' and a <= 'c-1015=w';
 a	filler
 c-1011=w	filler
-c-1012=w	filler
-c-1013=w	filler
-c-1014=w	filler
-c-1015=w	filler
 c-1011=w	filler-1
-c-1012=w	filler-1
-c-1013=w	filler-1
-c-1014=w	filler-1
-c-1015=w	filler-1
 c-1011=w	filler-2
+c-1012=w	filler
+c-1012=w	filler-1
 c-1012=w	filler-2
+c-1013=w	filler
+c-1013=w	filler-1
 c-1013=w	filler-2
+c-1014=w	filler
+c-1014=w	filler-1
 c-1014=w	filler-2
+c-1015=w	filler
+c-1015=w	filler-1
 c-1015=w	filler-2
 select a,filler from t3 where (a>='c-1011=w' and a <= 'c-1013=w') or
 (a>='c-1014=w' and a <= 'c-1015=w');
 a	filler
 c-1011=w	filler
-c-1012=w	filler
-c-1013=w	filler
-c-1014=w	filler
-c-1015=w	filler
 c-1011=w	filler-1
-c-1012=w	filler-1
-c-1013=w	filler-1
-c-1014=w	filler-1
-c-1015=w	filler-1
 c-1011=w	filler-2
+c-1012=w	filler
+c-1012=w	filler-1
 c-1012=w	filler-2
+c-1013=w	filler
+c-1013=w	filler-1
 c-1013=w	filler-2
+c-1014=w	filler
+c-1014=w	filler-1
 c-1014=w	filler-2
+c-1015=w	filler
+c-1015=w	filler-1
 c-1015=w	filler-2
 insert into t3 values ('c-1013=z', 'c-1013=z', 'err');
 insert into t3 values ('a-1014=w', 'a-1014=w', 'err');
@@ -62,59 +62,59 @@ select a,filler from t3 where (a>='c-101
 (a>='c-1014=w' and a <= 'c-1015=w');
 a	filler
 c-1011=w	filler
-c-1012=w	filler
-c-1013=w	filler
-c-1014=w	filler
-c-1015=w	filler
 c-1011=w	filler-1
-c-1012=w	filler-1
-c-1013=w	filler-1
-c-1014=w	filler-1
-c-1015=w	filler-1
 c-1011=w	filler-2
+c-1012=w	filler
+c-1012=w	filler-1
 c-1012=w	filler-2
+c-1013=w	filler
+c-1013=w	filler-1
 c-1013=w	filler-2
+c-1014=w	filler
+c-1014=w	filler-1
 c-1014=w	filler-2
+c-1015=w	filler
+c-1015=w	filler-1
 c-1015=w	filler-2
 delete from t3 where b in ('c-1013=z', 'a-1014=w');
 select a,filler from t3 where a='c-1011=w' or a='c-1012=w' or a='c-1013=w' or
 a='c-1014=w' or a='c-1015=w';
 a	filler
 c-1011=w	filler
-c-1012=w	filler
-c-1013=w	filler
-c-1014=w	filler
-c-1015=w	filler
 c-1011=w	filler-1
-c-1012=w	filler-1
-c-1013=w	filler-1
-c-1014=w	filler-1
-c-1015=w	filler-1
 c-1011=w	filler-2
+c-1012=w	filler
+c-1012=w	filler-1
 c-1012=w	filler-2
+c-1013=w	filler
+c-1013=w	filler-1
 c-1013=w	filler-2
+c-1014=w	filler
+c-1014=w	filler-1
 c-1014=w	filler-2
+c-1015=w	filler
+c-1015=w	filler-1
 c-1015=w	filler-2
 insert into t3 values ('c-1013=w', 'del-me', 'inserted');
 select a,filler from t3 where a='c-1011=w' or a='c-1012=w' or a='c-1013=w' or
 a='c-1014=w' or a='c-1015=w';
 a	filler
 c-1011=w	filler
-c-1012=w	filler
-c-1013=w	filler
-c-1014=w	filler
-c-1015=w	filler
 c-1011=w	filler-1
-c-1012=w	filler-1
-c-1013=w	filler-1
-c-1014=w	filler-1
-c-1015=w	filler-1
 c-1011=w	filler-2
+c-1012=w	filler
+c-1012=w	filler-1
 c-1012=w	filler-2
+c-1013=w	filler
+c-1013=w	filler-1
 c-1013=w	filler-2
+c-1013=w	inserted
+c-1014=w	filler
+c-1014=w	filler-1
 c-1014=w	filler-2
+c-1015=w	filler
+c-1015=w	filler-1
 c-1015=w	filler-2
-c-1013=w	inserted
 delete from t3 where b='del-me';
 alter table t3 add primary key(b);
 select b,filler from t3 where (b>='c-1011=w' and b<= 'c-1018=w') or 
@@ -183,7 +183,7 @@ explain 
 select * from t4 where a IS NULL and b IS NULL and (c IS NULL or c='no-such-row1'
                                                       or c='no-such-row2');
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t4	range	idx1	idx1	29	NULL	16	Using index condition; Using MRR
+1	SIMPLE	t4	range	idx1	idx1	29	NULL	16	Using where
 select * from t4 where a IS NULL and b IS NULL and (c IS NULL or c='no-such-row1'
                                                     or c='no-such-row2');
 a	b	c	filler
@@ -205,7 +205,7 @@ NULL	NULL	NULL	NULL-1
 explain 
 select * from t4 where (a ='b-1' or a='bb-1') and b IS NULL and (c='c-1' or c='cc-2');
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t4	range	idx1	idx1	29	NULL	32	Using index condition; Using MRR
+1	SIMPLE	t4	range	idx1	idx1	29	NULL	32	Using where
 select * from t4 where (a ='b-1' or a='bb-1') and b IS NULL and (c='c-1' or c='cc-2');
 a	b	c	filler
 b-1	NULL	c-1	NULL-15
@@ -306,7 +306,7 @@ from t1 A, t1 B, t1 C;
 explain
 select count(length(a) + length(filler)) from t2 where a>='a-1000-a' and a <'a-1001-a';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	range	a	a	9	NULL	99	Using index condition; Using MRR
+1	SIMPLE	t2	range	a	a	9	NULL	99	Using where
 select count(length(a) + length(filler)) from t2 where a>='a-1000-a' and a <'a-1001-a';
 count(length(a) + length(filler))
 100
@@ -316,7 +316,7 @@ filler char(10), key(d), primary key (a,
 insert into t2 select A.a, B.a, B.a, A.a, 'filler' from t1 A, t1 B;
 explain select * from t2 force index (d) where d < 10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	range	d	d	5	NULL	47	Using index condition; Using MRR
+1	SIMPLE	t2	range	d	d	5	NULL	47	Using where
 drop table t2;
 drop table t1;
 set @@read_rnd_buffer_size= @read_rnd_buffer_size_save;

=== modified file 'mysql-test/r/subselect_sj2_jcl6.result'
--- a/mysql-test/r/subselect_sj2_jcl6.result	2009-04-02 21:57:08 +0000
+++ b/mysql-test/r/subselect_sj2_jcl6.result	2009-06-19 09:12:06 +0000
@@ -78,7 +78,7 @@ from t0 A, t0 B where B.a <5;
 explain select * from t3 where b in (select a from t0);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t0	ALL	NULL	NULL	NULL	NULL	10	Materialize; Scan
-1	PRIMARY	t3	ref	b	b	5	test.t0.a	1	Using join buffer
+1	PRIMARY	t3	ref	b	b	5	test.t0.a	1	
 set @save_ecp= @@engine_condition_pushdown;
 set engine_condition_pushdown=0;
 select * from t3 where b in (select A.a+B.a from t0 A, t0 B where B.a<5);


Attachment: [text/bzr-bundle] bzr/alik@sun.com-20090619091206-hl4zmn59px2v8ole.bundle
Thread
bzr commit into mysql-5.4-bugfixing branch (alik:2803) Bug#45029Alexander Nozdrin19 Jun