From: Andrei Elkin Date: June 12 2011 7:33pm Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3286) WL#5569 List-Archive: http://lists.mysql.com/commits/139119 Message-Id: <201106121933.p5CJXhfF005530@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0041379420==" --===============0041379420== 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/MERGE/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped 3286 Andrei Elkin 2011-06-12 wl#5569 MTS making default.push to run rpl suite with non-default --mts-slave-parallel-workers > 0 in all three format/mode (row,stmt, mixed). The default is run for all suites in mixed mode and rpl suites with row+ps, stmt formats. modified: mysql-test/collections/default.push === modified file 'mysql-test/collections/default.push' --- a/mysql-test/collections/default.push 2011-03-23 11:37:04 +0000 +++ b/mysql-test/collections/default.push 2011-06-12 19:33:32 +0000 @@ -1,3 +1,11 @@ -perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests -perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_ps_row --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list -perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded --vardir=var-main_emebbed --suite=main --embedded --experimental=collections/default.experimental --skip-ndb +perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --unit-tests + +perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_ps_row --vardir=var-rpl-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --suite=rpl + +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_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_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 --===============0041379420== 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/MERGE/mysql-\ # next-mr-wl5569/ # testament_sha1: 1fec9a0953a26d79edfadace3a6d7df24706ee03 # timestamp: 2011-06-12 22:33:43 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/mysql-trunk/ # base_revision_id: andrei.elkin@stripped\ # w2d3qei7p9pb2odr # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa/qSMUAAjhfgAAQWG//93IC DAC////wUAVNeNdWj3uvTbQbsrVISRImSb1MTSnp6npNoE9TMkm0GkBhlDUwCNAk9TQ9TQNAAAAS QmlNop6TyamptqJo0ADagNpNPUEVInpDU2gmmmmGgTTTJoaaaNoBFJNAEaA00TU/SKfqnlPU9T1H qA9I9T82ntXgNZp4TdmWo7qXcWTwcaxyRkQ5ChjQL6/jN6HIUeZtHN+TaK8ViovVLMzicu0Ja3Xx OHj+icN0M9pLVLfw0y1nuz9n/2ezPGE3lLYLT2zunySz6551MNNHJu8J8dflL9CUDb9jPHrv1SrG pQhgRhhQ+Z4HyJQeoPGAeYyu3DEwDljWMW8ApG8gmcLmxLRzqGsIayEgZkhsYA9mukPN9M8cLRL+ wjoFjInDR4rUXCu9bFq3DBasIpju9aiibT7OttTU+c0JcPCmc7nNvmz700YDielEnpr7e9Jgwh06 ma4ZUBFRLFz0vFxASQeq+FrLfk+ohupAYWNE9+dSDHUVZm847D5eMrJDZyRm/lQWQhU1ZYM2U9VA c9eo4BZqaPLo6TBRQO0FLEm8Niat1K3MLzsuDELGW9xylIH5ihQya9jstxcKZ3Hc5pagd5Y6oqsW EBV3KVZPcJzMI7Ac9b4WyxDWT5Ki207aDrB1MBAWraMomcWyvwrFDFgKIWlHK0DAV5SZiKUGdA8X UVpuN8KyU0CdGQsU2KwgWVNUgeA1ymUp4jo0jvyEsEfYb4MyVkgugdf54bJxI6LFEGB/SVypqCoI fONUasqHCC0dWCVQIKul/HUc98Djw7xEVR474SBrkC9+8oI0o8ZrtNBn5SunmLjmIcTIxQYDGIL1 FalThxFLmMqwOey3qLWXdDqKzmRx6E8XtH64drIgT+jtzH4UxHG2t3qXR329937Zm9z3XNjFUFcC gLSTFV94m1O2jYWCwWVdyRF91wmwps8r0oJG+Qj7Xa7pMxjyijL5jvHMFGqCXQ0MRqNvHbI1+gFC Rw5p8Azy9rXcnJFgI0OoswmYFqnTix9FP46CHsEUGgVyGILFuHuO+bTwTn2dg8jcC22E1B6cvOql 6hMmFxdoUC2CqRWd4bhg6zyRVYMiHIv1fDFDT4HBoBoA2dIIE6wF8eI/fLGnbawwtY4DdcGGJ5ge hohdp+bvHkZcQpUyDOwdHxTqTGQ1jFcRql1gIG4C2cNNBSwBWMhmtQOmAkFaB8DX/FokjpqWQm/g MA2TE84q2KV2HEcBDrBLgH6nQuX3lbYZ6DAPQTgr1kzXIZJhxDQWvrNhgkXOBGyKELBIM1ZYtCDw GMjByU20LpS+M7gHEo4Z19YWGou+hLwkPYIU7UN9Qnk2jr0eGQnSUP2aT3B0G+9PUYXWwMUvhbef UBoRYH+PgOtQpGjOt3LhGL5jGYWAm6LKMo+hwgDPKmt25ZmG69kDeEDCkqMnuSavaVCUFyUUJYl0 kidXGs5tf3sShxQpUUCi6Z26he5jeDQNrtkv3UKbAMSZXj/0rgqJ0pB5T1nfm5RKKNNwtpIioSwy GGrUcFVVFEmcGAGBaB548ahwOgl48RsrKA1IVuxlQYhffNw8cuW20DytBtKIHAlUEx5DMZLe7tYY rSx8O0pmmwCoJ0wdBZs0g8RYU2FeK/4u5IpwoSFf1JGK --===============0041379420==--