bzr commit into mysql-next-mr-rpl-merge branch (alfranio.correia:3034)

[Alfranio Correia]

#At file:///home/acorreia/workspace.sun/repository.mysql.new/bzrwork/wl-5563/mysql-next-mr.crash-safe/ based on revid:alfranio.correia@stripped

 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
=== 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;


Attachment: [text/bzr-bundle] bzr/[e-mail]