From: Andrei Elkin
Date: November 5 2010 1:21pm
Subject: bzr commit into mysql-next-mr branch (andrei.elkin:3192) Bug#57950
List-Archive: http://lists.mysql.com/commits/122950
X-Bug: 57950
Message-Id: <201011051321.oA5DLCHY013601@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0935846101=="

--===============0935846101==
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-wl2540/ based on revid:andrei.elkin@stripped

 3192 Andrei Elkin	2010-11-05
      Bug #57950
      
      restoring the default value of master_verify_checksum at server startup. The earlier changed aimed at getting more evidence to rpl_stm_start_stop_slave.

    modified:
      mysql-test/collections/mysql-next-mr.push
=== modified file 'mysql-test/collections/mysql-next-mr.push'
--- a/mysql-test/collections/mysql-next-mr.push	2010-11-04 19:21:43 +0000
+++ b/mysql-test/collections/mysql-next-mr.push	2010-11-05 13:20:51 +0000
@@ -1,4 +1,4 @@
-perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_checksum  --mysqld=--binlog-checksum=CRC32 --mysqld=--master-verify-checksum=1   --vardir=var-rpl_binlog_checksum --suite=binlog,rpl --skip-test-list=collections/disabled-per-push.list
+perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_checksum  --mysqld=--binlog-checksum=CRC32  --vardir=var-rpl_binlog_checksum --suite=binlog,rpl --skip-test-list=collections/disabled-per-push.list
 perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix          --vardir=var-n_mix                        --mysqld=--binlog-format=mixed  --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema --skip-test-list=collections/disabled-per-push.list
 perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row         --vardir=var-ps_row         --ps-protocol --mysqld=--binlog-format=row    --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema --skip-test-list=collections/disabled-per-push.list
 perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded       --vardir=var-emebbed        --embedded                                    --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema


--===============0935846101==
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-wl2540/
# testament_sha1: a041f3f8541a36b75482150a877dbc02ce623dff
# timestamp: 2010-11-05 15:21:12 +0200
# source_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/5.6.99-\
#   next-rm-wl2540-checksum/
# base_revision_id: andrei.elkin@stripped\
#   bn7y978wgjad87my
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcWeHeYAAZRfgAAQWGf/93oA
FAC////wUAQD3dQuOiMU5YSiCT0FT8jaJpkaSbap7UzVNPE1A0CUjUZMTQ0mptIYnqDQAAAEkQJP
VT21MielPNKep6nijTQ0DENqGAAAAAGg0AaAaASU1FPymCeo9JpPUek9Jk9RkAAaH53HfWVbLK63
EalnRIMYWNY9W9odX9vp52aOgrY9U8dk2xKAWwe/f7lFNIePmiTvGvZCViRg1pI91tfhY7jMVRLj
KZrUDuef1MbRDnMErEwq9BUbaQZdaP3OIiUwaPrntfcCwSKa89CtayEivQ9VOxEmSODTkyGE4VlE
6KMUxF4Y0AYolnMR4UCjC7jLumIeEh1U1vIibE8S8M4yfd7kufOYUJ6Y6z40jrTpYIRUXXMW68lt
iTy9s8MXDpQ37M3f3ERdiw2tnDB4V/TCZI6hdiYLEjqK4Je1KOQxrE24G0tvIuayooNfvkUItLRJ
sEaqy6+IzCN2EjdYd9rUHWtGSGl5ChLBJtTgI9sJJvtJGROweDMpRTBSEKpB0AuKlbh78qhoLKrY
P0VXRtmyQZpMrBpE0EgONdRuDbUrgK6fxFqlpi9kWji2ubT1ORHTTaJcE6Nf4E99thO1hfW1ZDjl
+JJUQ5QnVFPhvnR9XNaTQ4T69SHHRpprlbGUkCy5buXSh4lEqIaBwKuM5CQI1Gbf7Y5t4cDEVnxb
0lrVUNcxeUimhjv6YF2WU/QTMR64E3v+y1g1sLgsc5VSxxImzq5VNtvioxntBkjbI8kh9MiJH1qM
p2Uo16WW0g/UmDi4eSFfLU70NrvmcEk8YZGqnBzEQyXp20xwcOOuftj7DGTTBVdcwHI6FTc/X7Vf
VhibQS+Ovmp5UonRCEKVU3IxGb28X7rjJ7wZJqeLC69gqykQTiGN+9sC02Gc78o1WMbR+7mKgqQz
94bi5aHOcDpcq5gwIqQJ47WV6eK6WzQ2ENakxOpfABZNPwD66JP1BBZqyIZy/CE2WIc5qJwVwPnD
8ZfAy9VmHG4KwJsqOoz5VSGKLe1VztXy0pG7mo5XnIHPZF1IR4id+HKynhvZcWHoTlIwLjqEPtOX
jCpo0tkDQSGps0xD1dIlUxJKMHCKmA7JllE00voC8AgHByc+Dv1IYKNTMtjKnsolCeyNzMokOxwn
bje6aVepWa0UOQpCyNrDXg61Neko7ndsQTowvbEp0ZUbWUgtko9v3r0d5orV5Qgua7zAU6ZPpbmE
lKPBi2JqX1Eg5gxiwvaQCqHaC8BJvTSi7Ri2CVrWVnK0VJ1YK8uIMhlGu0s0SETVFRJhoZX4Q2av
OnLEcJ2fgEdOeuFldtsjyX1CkBmSkvc4hGw3CIis1FGH+LuSKcKEhizw7zA=


--===============0935846101==--