From: Tor Didriksen
Date: November 4 2010 10:22am
Subject: bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3359) Bug#55790
List-Archive: http://lists.mysql.com/commits/122817
X-Bug: 55790
Message-Id: <20101104102227.383AE35BB@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5276839889980228486=="

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

#At file:///export/home/didrik/repo/next-mr-bugfixing/ based on revid:tor.didriksen@stripped

 3359 Tor Didriksen	2010-11-04
      Bug #55790 Read_Master_Log_Pos is wrong
      
      Post-push fix: disable on windows, since it always fails.
     @ mysql-test/suite/rpl/t/rpl_packet.test
        We do not have grep/tail on windows.

    modified:
      mysql-test/suite/rpl/t/rpl_packet.test
=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-04 09:20:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-04 10:22:22 +0000
@@ -9,6 +9,9 @@
 # BUG#55322: SHOW BINLOG EVENTS increases @@SESSION.MAX_ALLOWED_PACKET
 
 # max-out size db name 
+# The grep | tail stuff below fails on windows.
+--source include/not_windows.inc
+
 source include/master-slave.inc;
 source include/have_binlog_format_row.inc;
 call mtr.add_suppression("Slave I/O: Got a packet bigger than 'max_allowed_packet' bytes, Error_code: 1153");


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   ga2k8za595zc8nir
# target_branch: file:///export/home/didrik/repo/next-mr-bugfixing/
# testament_sha1: cb39140d4dde1833e8cbb2e2a55a2c2a1bebf86b
# timestamp: 2010-11-04 11:22:27 +0100
# source_branch: file:///export/home/didrik/repo/trunk-bugfixing/
# base_revision_id: tor.didriksen@stripped\
#   rgnwzahii13duj83
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWSSqxUAAZ5fgEAQWGf/91YG
VIC////0UAPtPca5mRxdbnWEkpiamEyDJk0J6mRiGo0aGJphBJRDSYyaaEnhTT1T9U08k9TTQANA
BoE01J6mptpT1BoZAANAaeoA0OYAAAAAAAAAAEkip+gE0NMo02p6IzSNpNAA0Ayi7ufg7ZK368/J
tkurSai/TrpQQ14OjB7n1wsz4MzH7/J6s5g8jVU2e9M8efJn+/lNeP6ojFHPb0ounNIuddii8n+u
yWnfbR6dFIyMeZNQ6ZewiPcKp+hrLpJwwV3hph3KtaZKEipIfBGd5I9o210SxF1YyVUriwh6RBML
iOCDxGNh7OTcTnkV4FcFtI3UDMM1zxGyMUBGxRbia9KysR8MFRemU2BCmVGPCwLKFe8ye/n16cp0
VU2MWd4qLZLs2QpglQnAnC8cSdkGhXg41GqItFZXWcloQvhnAN6phhNGgIqwZ3Yk7gYr2iatcl75
65TsykB5ZaYPt+mUnfKXm4LajTATZcceuXcKfMyCbh/U4y1i226ZUIfWs+G/eoji7MY4wL7aHzQt
JNKVs2cA+MfgFI2gjBXwnSl9twLgBJlEpk5PCAOCswMhWwU1HY1bnpsrK0pHmzKEnBu7BQyKZMjm
gfEGi0UbjbypnawvbZ5eD0iBMzM3ntof8KDh520XxqadgvR05ugntv1NAMgrdvECSfgKpIpNbxwS
g89Z1wlO7wsR56DWStXy57kp96+mQ4wcd5fpwp5eXHYHGcKR4tY5Vf7JN1ixgA3ySLoLDpLw2ywK
cCRaQW+da3PWbQ2dI0F+9ohFC8eAW/NXX9+g5C5cpMmW8kLmHWY8YVNNJMRB3xVtUvArkx2VOm7c
zXWLhLFur0k66wUpFMi+7KQ3bdY8TN4oyBW5PwsTNwxN96u0ROGqs47bWnNWCqHnIVPma/cJ+UTW
BIZ80rOB/7PIFKjyA10xTi4B96Uh8bi8IwU5zIYgY8MrtIcoZaPL60WQlDfjVYqKrwdoNcWdWE2+
IMFcTuE5FobLgUzDfXKkKQpg5esBW5OLUpDLG7PM8y0xj2JGlSUERhJmHF0oj0chBGhED3mEGQCz
QIc/IE+uCEjI1zC3BqfnMCmUQ6QXfzSPlIYJl7LY5fR2FmOGcKcxogGndm1otcwSKMnrSyaouigk
I7nEr0h1IOSVtU7kdpXvaPCuMgXNWQF2YOv287E2fZPq8WLtZpxemshNmcNFUC4yZFluNQNrWLr7
2cJEBSYGU4PpsmxlbFQOHvSKEMiw7hZyotkjS49QF26kwl2UU3KgrReMb7XhcDmKM2L7vvRs4cHp
bbv3flZLDqorQOSqlFZ1bW6ASBAkDrUSnXBNkLqpsBQ6gs4CxGKVY/8XckU4UJBkkqsV


--===============5276839889980228486==--