From: Andrei Elkin Date: June 15 2011 5:31pm Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3292) WL#5569 List-Archive: http://lists.mysql.com/commits/139258 Message-Id: <201106151731.p5FHVpwV019717@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1813972723==" --===============1813972723== 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 3292 Andrei Elkin 2011-06-15 wl#5569 MTS correcting --slave-parallel-workers in collections/default.push modified: mysql-test/collections/default.push === modified file 'mysql-test/collections/default.push' --- a/mysql-test/collections/default.push 2011-06-12 19:33:32 +0000 +++ b/mysql-test/collections/default.push 2011-06-15 17:31:46 +0000 @@ -4,8 +4,8 @@ perl mysql-test-run.pl --timer --force - perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_stmt --vardir=var-rpl-stmt --mysqld=--binlog-format=statement --experimental=collections/default.experimental --skip-ndb --suite=rpl -perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_n_mix_MTS --vardir=var-rpl-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --unit-tests --mysqld=--mts-slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl +perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_n_mix_MTS --vardir=var-rpl-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl -perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_ps_row_MTS --vardir=var-rpl-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --mysqld=--mts-slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl +perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_ps_row_MTS --vardir=var-rpl-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl -perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_stmt_rpl_MTS --vardir=var-rpl-stmt --mysqld=--binlog-format=statement --experimental=collections/default.experimental --skip-ndb --mysqld=--mts-slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl +perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_stmt_rpl_MTS --vardir=var-rpl-stmt --mysqld=--binlog-format=statement --experimental=collections/default.experimental --skip-ndb --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl --===============1813972723== 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: af3d4e18efd610950d9fc122e5ac0d7bc433898b # timestamp: 2011-06-15 20:31:51 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@stripped\ # 2j5lu5sj98r68n07 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfYE6DcAAdNfgAAQWGP/93IC DAC////wUARngDWlUAAQyKMg0mnpHpNQ09R6m1HonqY1HqaeoFamibKemI01GTIwAEGmjE0xgABo AAyaAAANAYAAaAAMmgAADQCKQQJoaMhNMmqbExTDUj0n6p6epjPYLelV4QNDxLqqUAbIKgVYIIrz I45/mGZ0pZDslRxMzTzsKlu491jERM8hqj2RKqegZHwWn6/a9rzTWhFEP1tnuj+SUDdpvmyEYGBP jG8+BMGh6A9zpy8YohrsYv4hR1RS5zbnhUSsMM5NrAdhsqHi6UsU71LnBgN8tVcXhHfwbUlpyno8 spCVr9plrD/dXxIU2sXUzb22rKco4Ypxo9NdrroJw5HWWLiJOn3edNscscaP9G8dvXVghq4+iEjX 9+O7M2VM7vh1beKPMzfLUGDi5bKBZ8N7Itcq7hxOdZ4GFdj2ruP2OvVTszkTa5PPW31Ansl3wdC7 K0wH57WiajK/36p/FMSDZdNJ2nR0aaq29w4qS6d5utZac3Ayyc9DnKZdm5yJDHhumVGs6l9GlpcW 7jbHprKTLsRgHSj4ONkGCwfWA1KIBCmiPxgDmgXITiHxIM0NKQEk7RaxZnIoSYsihcFlsW4/g9OP nwJRjCH1HeNhVgO8+uXKckXSUIERPtaRodANAMsnufMQoiFXVAwxX2/xYHlzPP2xn796mtp5ap0D YPvJcpy5h0OpEvijn8uxYYTsl8cF93kv28U+pX7exj3e7u4How16957GsrPORg8FlRCRnvrPHIkP L33TFCV83UHcLQWG5/ANteqEnuPueTpERt29DxOb6OAOPP3dmawDuNO358enVvLDiYTqiukAr94R kY1eO9uvWj8CdrgDZQA7XKlHZSr9VM9MIYgeTJk6+NfLqh+gjqFtWIuWY4Po76tng+Ppsyg66HE6 cAOZ3djeZD+fX2noyIcie9+ck73IgLIvdqPE7toxqx/6xNr6jxLWg0TLrEK8hxp9H98N1d1jDCXO L9A3fl7Bb4ewydORmFQeIVf5H3fN8OrJuay8IIfACdwYTKsJayCi2IdsVILQfW3+71O7WlFz0YW7 3aqZDZdwcUO+CWh/VwW2HHoS+jNC9sDYx3MTUimFl9Qo/M1LJ0Ai6TNKOtXzpJh89YZWu95Ili/a EhqfKloXPgEDb4UcLQ+jg8s968ZQzPcejfe/hhxYCKvG7B7rQ5/RHk8w2b5tXc7VbF9bGbNyzBkm t2b8zHLBkOAQwMp5nWRDeyk1sSKMNmPa6AsZtKFHfXHRi+NU9wS7NXB3SX9o3ptnbgFJsseGcuW1 2eC1asRZYSGwsZ12XhoX000q4nNDUaNkg1hY7WU7pOzoOLpY9Ni3OFOQUeDRCS6nENb+GQ7rE9Ry aDNgMXij+tTQyQ/4u5IpwoSHsCdBuA== --===============1813972723==--