From: Mattias Jonsson
Date: December 3 2010 1:05pm
Subject: bzr commit into mysql-5.5-bugteam branch (mattias.jonsson:3165)
List-Archive: http://lists.mysql.com/commits/125932
Message-Id: <201012031306.oB3CTtMP001682@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3725854023900746928=="

--===============3725854023900746928==
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-bugteam/ based on revid:mattias.jonsson@stripped

 3165 Mattias Jonsson	2010-12-03
      post-push fix for test to work on row-based-replication

    modified:
      mysql-test/r/partition_binlog.result
      mysql-test/t/partition_binlog.test
=== modified file 'mysql-test/r/partition_binlog.result'
--- a/mysql-test/r/partition_binlog.result	2010-12-01 21:47:40 +0000
+++ b/mysql-test/r/partition_binlog.result	2010-12-03 13:05:33 +0000
@@ -41,13 +41,6 @@ ALTER TABLE t1 TRUNCATE PARTITION p0;
 ALTER TABLE t1 DROP PARTITION p0;
 show binlog events in 'master-bin.000001' from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(id INT)
-PARTITION BY RANGE (id)
-(PARTITION p0 VALUES LESS THAN (100),
-PARTITION pmax VALUES LESS THAN (MAXVALUE))
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1), (10), (100), (1000)
-master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; ALTER TABLE t1 ANALYZE PARTITION p0
 master-bin.000001	#	Query	#	#	use `test`; ALTER TABLE t1 OPTIMIZE PARTITION p0
 master-bin.000001	#	Query	#	#	use `test`; ALTER TABLE t1 REPAIR PARTITION p0

=== modified file 'mysql-test/t/partition_binlog.test'
--- a/mysql-test/t/partition_binlog.test	2010-12-01 21:47:40 +0000
+++ b/mysql-test/t/partition_binlog.test	2010-12-03 13:05:33 +0000
@@ -9,9 +9,6 @@ DROP TABLE IF EXISTS t1;
 --echo #            but the statement is written to binlog
 --echo #
 
---let $binlog_file=query_get_value(SHOW MASTER STATUS, File, 1)
---let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1)
-
 CREATE TABLE t1(id INT)
 PARTITION BY RANGE (id)
 (PARTITION p0 VALUES LESS THAN (100),
@@ -19,6 +16,9 @@ PARTITION BY RANGE (id)
 
 INSERT INTO t1 VALUES (1), (10), (100), (1000);
 
+--let $binlog_file=query_get_value(SHOW MASTER STATUS, File, 1)
+--let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1)
+
 --error ER_WRONG_PARTITION_NAME
 ALTER TABLE t1 TRUNCATE PARTITION p1;
 --error ER_DROP_PARTITION_NON_EXISTENT


--===============3725854023900746928==
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\
#   sj4s9mx0dwoentz4
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-5.5-bugteam/
# testament_sha1: 22735e969fd79c7aeb89e537dbf5f96ac2d2e119
# timestamp: 2010-12-03 14:05:59 +0100
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-51-bugteam/
# base_revision_id: mattias.jonsson@stripped\
#   fzrzpujzdgsv8g3f
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa5TovEAAgffgAAQVGf/93NS
3oC////wUASZ4A7U955JTS7MJKEI1PSNgk9qeplNqGmJkGgAaGgaU1PKPJkm2oQAAAAAAACU0gJE
2mphNDQAGgADRoAEkUk9GU8UwhiY1NpGh6nqMaCDRowJJE00GiaZpGhpNMpqfqj9SAxMmDUCWG3M
RXrhu1yj0rIMTqxoIihoNifHAfL8FMJ1lRJMkafJpxnlHuUFtOPO87RthCVlfjrH6DwPP80/vpkI
erkSc4J66T5YwM9M9CmPdD2QdCY1hDZR7jUgDw4h9kLT/evksrW/A4kXu5bgMzi1j7xK8S+opl1c
DcVQEMxi8c8MDhINEBFAMJnm+k4GwvIpFZuHBQBSzFZB6kD1aZhzAc+wKL1ZQ5OHPeQDVkB49h9z
T0iRfRFJEfs62c92IGUvqH8Ko9bvuUq2RFxP9un4yjfPGogYm0wM9/NrWQFSEbU9xthYZ6yu2KrU
bFkQtCon6/kFBwwsNJIMyQDopFLlsQQCPKjN5VSV1lnMOf/EWQ4cG4vJRJ7ilb5UsPKrh17Zpja6
+gjLAmBga8IY0hoXJ7wBBUA6S0QjYoMD7ggbVMRSogmJBuDaS8JtC3rAN6UYDOUiURjwImXWwlYU
vhMqp2vc2DfIlGxDUsQXNCpw/EycFFdvSiNJJS1pQBM8HEHqogw4SYgBCbhKtzzwKTjXoNFwseim
1WKVRobLmzFhzGYgkhRy+JzTGbUfRfqkyS9nga3YJs+oeZ9mkgaigItHAlFVqHlLwyGnrcIWThhY
oKiHFqh7z3ylekSw8mlNcjdtKSSiOeVJzBYElPepr2iWnZUcNerWPebtuqUbwF9EUewDN3l1ZizQ
KCxxOTmCgfUSf10UzGCXvEsnfAOwVWDTnjpbkXBSFA6hG2Clg0DsuihH47APgTGgDAFum8mP7jSO
pHOg9jOeUo7w4ZGDNlhy1Rs43Ppx3Mq3tNK1JgZQGW2VwptaOJC2hwMdAgNREiLipvz1jBqrI7FG
7EvsvNHcpINWc0J4sRgGxfKgy6ikcplli04nUYV/IqyDgc73JLV2d2xDQvXE/xkPN+aJage7ljRH
IGEzYoc4XG15j4cBrEsj0+xlxzvRtlwgxEz3BepRJiIFvNkx3AMxLYGc+3mhPGzXBHxPkmHa1p20
vDlXCC9O4EyqkEuxF6PBQOgwHtB6S4CewJl6Ty8BP6AbwMaSntxocSYCjjvEojpk4iTokgVEC5Pd
y2sUxs5MMHl0GYgqvM0tj1ZprlHDW8s9Typ73JyQfnQlZ4V/eaqK6wvdthZSwqQcYJ7gYS8AVZa4
2RjdMZW5idEzkAFMoUyJLAbiWlJMRso5EO2FOdUXIp1fqlvRI6AVRD2Yc5trWHBXrZMzX7TIzSgN
LIVUyReu7RYK60k4Ccj29jpxXpIreOW8sVfTejw4J3gZYdAKs+Ie81CSNyIm8OAE/NSUqqluV66E
YcxdyRThQkK5TovE


--===============3725854023900746928==--