From: Andrei Elkin
Date: April 3 2011 10:09am
Subject: bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3274)
List-Archive: http://lists.mysql.com/commits/134555
Message-Id: <201104031009.p33A9fu1006706@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0341193093=="

--===============0341193093==
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-no-dbug-benchmarking/ based on revid:andrei.elkin@stripped

 3274 Andrei Elkin	2011-04-03
      merge from the main repo

    modified:
      mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test
      mysql-test/suite/rpl/t/rpl_parallel-slave.opt
=== modified file 'mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test'
--- a/mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test	2011-04-02 11:32:02 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test	2011-04-03 10:09:35 +0000
@@ -6,7 +6,7 @@
 # load volume parameter
 #
 
-let $iter= 128;
+let $iter= 256;
 let $tables= 4;
 let $wk_queries= 16;
 let $nk_queries= 0;

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_parallel-slave.opt	2011-04-03 10:07:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel-slave.opt	2011-04-03 10:09:35 +0000
@@ -1,2 +1 @@
 --log-warnings=0 --slave-transaction-retries=0
-


--===============0341193093==
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-no-dbug-benchmarking/
# testament_sha1: 11bdc5ddb1e5a203476ca8c1a3554122013a5f5e
# timestamp: 2011-04-03 13:09:41 +0300
# base_revision_id: andrei.elkin@stripped\
#   ptvutwjgxdtgy38z
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbOXQW4AAd/fgAAQVGP//3IA
AAC////wUARa8zt13LjnZqUddhJIQU1PwjEYSeqP000p4U09TQz1BKKm9IaYhoU9NR6ho9QABoAS
gghMmU/RJkMRiNA0NADAaA0AAGmg0A0AaBJITTQNCnkFPyNFGmT0mj0mmgrt0po9c+4WkmRluxsR
CJST6IxnB+b3m8vRUVeXkjrG6PHjhBQc4e0knQ8fLrGnPdiRkvOVlBtLO9MxX3sQ9kHMroD2IlyF
p+OfIywLj276+/gGmxHSwCuLtRLmJMrd5OyBA0oEwwNoDuDwXHcgHK2L9lAcYEUudETE1zCcIjgT
BwxHZ/AtAU5VHbaCVHnWgGWko7/BJESSlaSnMIY7W0FUWGgFyV8HyHTwPKOsnLSPJ3/QteSAR37x
kfRYKYu5dHC0Ey+CKjIrfoRRTYEJkgB1LGgD8yRCWdtgV5T8NLdpQkpgn3xyl0Ik8rg+ywqG1lx3
uUhRcmyJ+enIBxI8Dwma3SuIgV47DFjjG+s4C3XZZxgnCr6JYOXErSDErCrPG1jpJlpJW2aZEaWS
B82cs1PPuyRwWY8MSlmaAxbndcFmGwFpfqXzapa6JZExnRkWGByGQQHhIaQhTEm0DB0X1V2KjXCW
4QZaStkjNwVlglSEprO7indwoZjgZOqqmrkcYiJ1yLBhmb3dNappIDhkZQFnjDKNERXONGF7DWta
cdDPO93Jwkddu56KJXCrNzrUXF6Yd54ToWxHzat5z1dngc8Lbv+uri/jXnmKFF40z5V020lIxAcd
vXFgvcwl6iWHF4Fxcy8x7jHrlMnb6G6jEO2IVhm6SOG6200L8PMDovvICxJWaB5dSP2cJf5MfO/e
ReeuJIoO0y6F2XdAeg0mgc/TfTpFX6niiJnKEdVj87hycxJjIPRXJkTbKKSzl644wiTNNsRU9HSK
83GRxMbszDwWkY70WRuXY0P0VMdWbWzvm1vYUtmoSB+cgG6Cfa8I0kw0AIm+RaR7c0NG1bxOMumL
JBO3xwqhdSjDRFvxyzN8pKP9gwqayRgIRJLgiHgCrbVHKVqVUEvIB66lwkwUCz9zT3qEoPFuxgTJ
dzFJdzZjNVmpecaYQXXtJ7ylRBhJqim4II1eJRRwP4OIxPYGDnptpvwAdekpEez/IzaiXzRYqnK+
TG/Yo7XbtRcHDBSpTAyqz5UxnAI3LhW8KIiXYBkUCv8Uk5KdnRyqMJxKlZlRh8fDDM84lcsGTqsx
sn4GbFQ43ocRDLxNSMx6qRUhqm5vjbTZvqjGBAGNw2E8G24FnUDX0B7ssqEr0ME74OfFwTwCvQOs
CsCfN9fJtvQK1auKOAUsiOqC/AqgcQ9CxEmBUmg4JGxFIyzArnpXPil4q37T/F3JFOFCQs5dBbg=


--===============0341193093==--