bzr commit into mysql-5.5-merge branch (mattias.jonsson:3204) Bug#53806

[Mattias Jonsson]

#At file:///Users/mattiasj/mysql-bzr/topush-5.5-merge/ based on revid:mattias.jonsson@stripped

 3204 Mattias Jonsson	2010-09-14 [merge]
      post push patch, fixing test result for bug#53806/46754.

    modified:
      mysql-test/r/partition_column.result
      mysql-test/r/partition_column_prune.result
=== modified file 'mysql-test/r/partition_column.result'
--- a/mysql-test/r/partition_column.result	2010-05-26 07:56:55 +0000
+++ b/mysql-test/r/partition_column.result	2010-09-14 08:56:11 +0000
@@ -611,7 +611,7 @@ partition p1 values less than (3,3),
 partition p2 values less than (9,5));
 explain partitions select * from t1 where b < 2;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p0,p1	ALL	NULL	NULL	NULL	NULL	7	Using where
+1	SIMPLE	t1	p0,p1	ALL	NULL	NULL	NULL	NULL	5	Using where
 select * from t1 where b < 2;
 a	b
 0	1
@@ -647,7 +647,7 @@ alter table t1 reorganize partition p2 i
 partition p22 values less than (9,5));
 explain partitions select * from t1 where b < 4;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p0,p11,p12,p21	ALL	NULL	NULL	NULL	NULL	7	Using where
+1	SIMPLE	t1	p0,p11,p12,p21	ALL	NULL	NULL	NULL	NULL	6	Using where
 select * from t1 where b < 4;
 a	b
 0	1

=== modified file 'mysql-test/r/partition_column_prune.result'
--- a/mysql-test/r/partition_column_prune.result	2009-11-30 15:55:03 +0000
+++ b/mysql-test/r/partition_column_prune.result	2010-09-14 08:56:11 +0000
@@ -59,8 +59,8 @@ id	select_type	table	partitions	type	pos
 1	SIMPLE	t1	p01,p02,p03,p11	ALL	NULL	NULL	NULL	NULL	8	Using where
 explain partitions select * from t1 where a=4;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p11,p12,p13,p21	ALL	NULL	NULL	NULL	NULL	14	Using where
+1	SIMPLE	t1	p11,p12,p13,p21	ALL	NULL	NULL	NULL	NULL	8	Using where
 explain partitions select * from t1 where a=2 and b < 22;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p01,p02,p03	ALL	NULL	NULL	NULL	NULL	14	Using where
+1	SIMPLE	t1	p01,p02,p03	ALL	NULL	NULL	NULL	NULL	6	Using where
 drop table t1;


Attachment: [text/bzr-bundle] bzr/[e-mail]