MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Alfranio Correia Date:September 15 2010 10:20am
Subject:bzr push into mysql-next-mr-rpl-merge branch (alfranio.correia:3033 to 3034)
View as plain text  
 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;


Attachment: [text/bzr-bundle] bzr/alfranio.correia@oracle.com-20100915101943-nnc7f7g3004yif59.bundle
Thread
bzr push into mysql-next-mr-rpl-merge branch (alfranio.correia:3033 to 3034)Alfranio Correia15 Sep