From: Mattias Jonsson
Date: September 14 2010 8:57am
Subject: bzr commit into mysql-5.5-merge branch (mattias.jonsson:3204) Bug#53806
List-Archive: http://lists.mysql.com/commits/118153
X-Bug: 53806
Message-Id: <201009140900.o8E900Lt014456@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8977428033729718515=="

--===============8977428033729718515==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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;


--===============8977428033729718515==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   bscg6mvabouxns3n
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-5.5-merge/
# testament_sha1: 80b6fe2509d8b2ccdb572d8cc5575bf53c4b954b
# timestamp: 2010-09-14 10:58:04 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-51-bugteam/
# base_revision_id: mattias.jonsson@stripped\
#   vqxohc7qab24l7q4
# 
# Begin bundle
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


--===============8977428033729718515==--