From: Andrei Elkin
Date: June 17 2011 11:00am
Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3302) WL#5569
List-Archive: http://lists.mysql.com/commits/139410
Message-Id: <201106171100.p5HB0lIw004269@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0843661619=="

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

#At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped

 3302 Andrei Elkin	2011-06-17
      wl#5569 MTS
      
      fixing rpl_row_basic_3innodb similarly to the previous patch.
     @ mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
        a suppression is added.

    modified:
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2011-06-17 11:00:41 +0000
@@ -484,6 +484,7 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS = @sav
 call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
 call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* Error_code: 1032");
 call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t.. cannot be converted from type.*, Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 include/rpl_reset.inc
 [expecting slave to replicate correctly]
 INSERT INTO t4 VALUES (1, "", 1);


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@stripped
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\
#   mr-wl5569/
# testament_sha1: bf509c7dd6d3c67a9ee1f837026351ff07ffcaa3
# timestamp: 2011-06-17 14:00:47 +0300
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/
# base_revision_id: andrei.elkin@stripped\
#   azpyctgtna4mrubm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdeTbxEAAZFfgEAQWGf//3IC
DAC////wUAQdeOgaKoAdBohJ4I1D1DamIjaJoYAAIxCQ01M9SbKaDI0wRiZAxBpkwwGgAAGgAAAA
ADU9TKamTIxDQDQBoGhoAASSCZNAmTQAIymaTE1GnpAepRFhvmqWYZ7qXA2SCIBSBbc2YwBrWvSU
PkkVUs8K7E0MSiAWvL27HTvPl/cN7gnpgcbrXJD+KcJvmGRr6I1NUnEKfdO7ORjl174XB+hGHDap
6L2lZ8/KyfyFmras5xhRI4iLdppdbG1pa8GvmLRa57hMs2EYPOV7xc2UFFerkFcZv8SNYMpQWtNh
R3IVwpJboC9mmmQa8x91c4CQCGs7KEicDpSThmoxsBX3S4LBCAUTFwUgxNvGVmWbpBn7oWa8rHJl
rdHX4Ea65YQCR/YvDlfHjwvugudyjGigWvyuP5FhdYnCc4nc6pPOFTjio3tLhmZa8CRA3LRhIztU
rxdak+qC2QMpfEA6FmkoaUwPpXEZeJIq6mrxwc97FkX0QbHjOdU11ahNvqH+ilska7UFr8zY6qty
xJvqPrunphUv4MOqGadb5V0t9uLtKawixhnCvU2urnPQ9Z42hDRQ3WyaI8cTqZ6g57OJ1gLYbd2T
cLHx0SQY/OdltwENK3GDM+6Jx58vrBf4K4685HHpe4T4LFsIhJQzPty9uiRy7Z87zmemRMP+VPxr
xzqtzXI2jO/zvGxG71F4G+FrPuqz7+imGqBbYeh6GZ7i6HKg5VZ7fwqPh7rFdw9aYmFgowLM9jRy
ZkjxSIKqZyL7BSmPiWxENF+GCQaUgpSyUkqMN2goyGmofKgwx5cu8T7XJFV1mnjj6E+D0Jvx2/NH
WD9WELdpW6hIHzzqxjPHE2ytDrsDpnIhTrWZu7otBDYCewVEZc2SmzRrxJkRzksHqqGlcjh5HK4y
5Fx9/Le3Z2gcPHGkVosVxGYyB3xK9Pb8qxYAoGqaTW+vqDbqqGC25ogUykzCJOcF1e/DzF+temVg
pUYMU/2NGj7w8/2T16Lz7i4m/wmkcAwd7fR5dAuWEWVXOOfVOP9rSfLsG95ikMt0PmsQ7hwWOGez
X8CMFQTnqBRsC9caowPHusfWBCakqNRniG2Kb6YucwfThFVcAbuvh4t4o4ieyZfH7r7XtIWjgCkK
xw8qPpIYLOla8ukU0aTFu3hrt2uZM04jTkA6PWG1QIS0Kiq2au1uHzBOqSXBpefukORecxr+2gsv
pNgtfNhXNzU/1CuehMtmGed2ZPHm17YRxFocWhyjRXVRWOLU5q8xZEpNEJUiIqWItJpj2hjyqFQg
iFC5ZJUrgzsfQGOeyMfZjoaxC9bvh1bLC0WpQWyZ4sVssNwskF1qbYjp/GqYuotdedOSzsDKg9x0
W1ZKalo6zPAUlkqql+al/4u5IpwoSGvJt4iA


--===============0843661619==--