From: Alfranio Correia
Date: September 15 2010 10:20am
Subject: bzr push into mysql-next-mr-rpl-merge branch (alfranio.correia:3033 to 3034)
List-Archive: http://lists.mysql.com/commits/118294
Message-Id: <201009151021.o8FAJTlE027963@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1528098038=="

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

 3034 Alfranio Correia	2010-09-15
      Post-merge fix.

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/suite/sys_vars/r/all_vars.result
 3033 Alfranio Correia	2010-09-15 [merge]
      merge mysql-next-mr-wl5563 --> mysql-next-mr.crash-safe
      
      Specifically, it merges WL#5563 into WL#2775.
      
      Conflicts:
        Text conflict in sql/log_event.cc
        Text conflict in sql/rpl_rli.cc
        Text conflict in sql/rpl_rli.h
        Text conflict in sql/rpl_slave.cc
        Text conflict in sql/sql_class.h

    modified:
      sql/log_event.cc
      sql/log_event.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_slave.cc
      sql/rpl_utility.h
      sql/sql_class.h
      sql/sql_parse.cc
      sql/sys_vars.cc
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2010-09-13 23:57:59 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2010-09-15 10:19:43 +0000
@@ -628,6 +628,8 @@ The following options may be given as th
  --slave-net-timeout=# 
  Number of seconds to wait for more data from a
  master/slave connection before aborting the read
+ --slave-parallel-workers=# 
+ Number of worker threads for executing events in parallel
  --slave-skip-errors=name 
  Tells the slave thread to continue replication when a
  query event returns an error from the provided list
@@ -915,6 +917,7 @@ skip-slave-start FALSE
 slave-compressed-protocol FALSE
 slave-exec-mode STRICT
 slave-net-timeout 3600
+slave-parallel-workers 4
 slave-skip-errors (No default value)
 slave-transaction-retries 10
 slave-type-conversions 

=== modified file 'mysql-test/suite/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result	2010-06-23 01:50:38 +0000
+++ b/mysql-test/suite/sys_vars/r/all_vars.result	2010-09-15 10:19:43 +0000
@@ -15,10 +15,12 @@ INNODB_MONITOR_COUNTER_RESET_ALL
 INNODB_MONITOR_COUNTER_ON
 INNODB_MONITOR_COUNTER_OFF
 INNODB_FILE_FORMAT_MAX
+SLAVE_PARALLEL_WORKERS
 INNODB_MONITOR_COUNTER_RESET
 INNODB_MONITOR_COUNTER_RESET_ALL
 INNODB_MONITOR_COUNTER_ON
 INNODB_MONITOR_COUNTER_OFF
 INNODB_FILE_FORMAT_MAX
+SLAVE_PARALLEL_WORKERS
 drop table t1;
 drop table t2;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alfranio.correia@stripped\
#   nnc7f7g3004yif59
# target_branch: file:///home/acorreia/workspace.sun\
#   /repository.mysql.new/bzrwork/wl-5563/mysql-next-mr.crash-safe/
# testament_sha1: a0e6ae50e08ef5c533d3b4b55ab0594ce784b013
# timestamp: 2010-09-15 11:20:56 +0100
# source_branch: file:///home/acorreia/workspace.sun\
#   /repository.mysql.new/bzrwork/wl-5563/mysql-next-mr-wl5563/
# base_revision_id: alfranio.correia@stripped\
#   xf3l21gh434nczsv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTb1OQIAAi/fgAAQWGP/93oN
2YC////wUAS7t7k9UGurpQ7257YSSJpqm00yg8EynqbU9T1A0BGnqaaaaAkqZSfoxAp4p6ZQeoPS
ZADQAAEkIhT0h6TMUyGhkA9QNAAAMVTxQaGRoA0AAAGmg0AEogCMgjT1KbU2pobKaAyAZoNRXZea
hvDc86C8jIVyVsNZBsiTXEod2t23lE8bRjMA4IJFIScwZWzgqCCbAx8KVz8SaQzfXgjljL3b7I+s
lKnIHcKsGLC3q5oFjdiZgWN1Lo/LNs1h8IVFBfwzhRSnu8KgePqG7btCJlJOpzJCJ0oI/nuyqMKW
JPUZCvFQgzMoa1MzgNFwwOC5NJCFCZ1N4AmVKdSC6e7CmwMwKMoMsMT6ibzkUmcqzGKEFBWEj2RO
1qCZFcQJR3GUODGwKkxSbGLHRug5PHiGGIpupJIqBPUizHRuHkF+lA3xAptMBgwpg2yZNgMZjPeI
LYxL3MC1Qc8wxzGwdqp00EKQeaNQ0HnlKopnzLwIpsgdgFC7YekoPK6vWMLRyjY4l0mFWUFhlK2m
esgthv0wfbAHyQdpaRAy1pHqhpTpmXNGFYJv1YjXWF4jksAprvqQLwS4XZ1RzmTIMUjFCCkIg5r0
gXs0GazYPWJhuKphjfaOhuGGebA066aXCmG+bHVa9qrYffXBXWGDsAcA4DnI0mjAlkm2uvYSZSVX
lJDeBxLVHqYKFEvM3IBtMT2mIGJO4jMahgQ21zHxZfc65CSwR1mosvhROAaloWwimprMFluLTI7Y
h3XRp1mHBchfR5HI+uNFFFU8M2POR5kz+DjkSJehzKPOZAmVHEpIai2guGQ1m9waL1eLLPE0NOuK
FlH/Y8PUSiccx95mQQluDrOCKM88XOWCarFm9yiJXMQ7Ub2JltXlr8zeeA/C64o1yWZoNuJFTE5z
2AezX7GYS9hKeQSf3OTLp7aqm10j6KEwiEwSVFo5D5aqDBWaHe0D0vHADQfQfkuvlu9417uOnM5z
CzJh3KTI68uQ05ThwwznytajdOJUrZJBo/LilRWoGCn3766q8NJTPOErTC2zsRkN3nIdnLcZmo5e
XJXVASnqBfsMzWcSooevA7itRrcuPpEr3SUgYOv2MyOpV90518Xav0PeKeXaT4dHTUk40SXIS8Xo
hoeIEywE88NpyXI2Qt/mHNCkSqRUjS2mQ5/jGa8jcrbkeV+phdqnRPfId7D1Ib4rMoEmCC++0StY
WUyuHC1RayXeJVKV5VZsLouhJTm+GtpUFLNnGWksAr5VQidLkmdxLOOg1GUFyIRyQzATDStElhF1
od8BOUh4sP2eQeDj6q1olt3cZzF7hgkUZsJG8uIyZHjG69sdJ3qCQQXnYJVxxEtxLxFXnaoqicWD
LmiWh6kGBDnlYEl900s9cHNUTJEg8I0uuxOxE9chFGAwTONcBVIKazt6B5B494KuUbAqwpahvmhc
g5Q2Q6HncWx4YdEBP8uOM+CeSKhWva1kWECy8tY164lEjmUrhah9ZubX0dgGhFMIrVGhV7T/F3JF
OFCQNvU5Ag==


--===============1528098038==--