List:Commits« Previous MessageNext Message »
From:Luis Soares Date:June 16 2011 12:42am
Subject:bzr push into mysql-next-mr-wl5569 branch (luis.soares:3293 to 3297) WL#5569
View as plain text  
 3297 Luis Soares	2011-06-16
      WL#5569
      
      Adding a global suppression for the warning that may appear when
      stopping the slave sql thread in the middle of a group. This 
      should affect MTS mode only.

    modified:
      mysql-test/include/mtr_warnings.sql
 3296 Luis Soares	2011-06-16
      WL#5569
      
      Renames worker-info-repository to slave-worker-info-repository in
      some tests option files.

    modified:
      mysql-test/suite/rpl/t/rpl_mixed_parallel_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_row_parallel_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_parallel_crash_safe-slave.opt
 3295 Luis Soares	2011-06-16
      WL#5569
      
      More test fixes. Removing remaining prefixes 'mts' from mts variables,
      which have been renamed recently.

    modified:
      mysql-test/extra/rpl_tests/rpl_crash_safe.inc
      mysql-test/suite/rpl/t/rpl_mixed_parallel_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_row_parallel_crash_safe-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_parallel_crash_safe-slave.opt
 3294 Luis Soares	2011-06-16
      WL#5569
      
      Fixing rpl_parallel result file.

    modified:
      mysql-test/suite/rpl/r/rpl_parallel.result
 3293 Andrei Elkin	2011-06-15
      wl#5569 MTS
      
      correcting --slave-parallel-workers in few more files

    modified:
      mysql-test/include/not_mts_slave_parallel_workers.inc
      mysql-test/suite/rpl/r/rpl_sequential.result
      mysql-test/suite/rpl/t/rpl_sequential.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_crash_safe.inc'
--- a/mysql-test/extra/rpl_tests/rpl_crash_safe.inc	2011-06-09 17:35:59 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_crash_safe.inc	2011-06-16 00:32:37 +0000
@@ -108,7 +108,7 @@ if (`SELECT HEX(@commands) != HEX('')`)
   connection master;
   sync_slave_with_master;
   --let $slave_after= `SELECT master_log_pos FROM mysql.slave_relay_log_info`
-  if (`SELECT $slave_after != $master_after && @@GLOBAL.mts_slave_parallel_workers = 0`)
+  if (`SELECT $slave_after != $master_after && @@GLOBAL.slave_parallel_workers = 0`)
   {
     --echo Slave is out of sync.
     --echo MASTER_BEFORE $master_before MASTER_AFTER $master_after SLAVE_BEFORE $slave_before SLAVE_AFTER $slave_after

=== modified file 'mysql-test/include/mtr_warnings.sql'
--- a/mysql-test/include/mtr_warnings.sql	2011-04-06 10:36:10 +0000
+++ b/mysql-test/include/mtr_warnings.sql	2011-06-16 00:41:32 +0000
@@ -211,6 +211,12 @@ INSERT INTO global_suppressions VALUES
  */
  (".*If a crash happens this configuration does not guarantee.*"),
 
+ /*
+  In MTS if the user issues a stop slave sql while it is scheduling a group
+  of events, this warning is emitted.
+  */
+ ("Slave SQL: Coordinator thread of multi-threaded slave is being stopped in the middle of assigning a group of events.*"),
+
  ("THE_LAST_SUPPRESSION")||
 
 

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel.result	2011-04-05 16:26:37 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel.result	2011-06-15 23:27:20 +0000
@@ -76,5 +76,4 @@ include/diff_tables.inc [master:test0.v_
 include/diff_tables.inc [master:test0.v_ti_nk, slave:test0.v_ti_nk]
 include/diff_tables.inc [master:test0.v_tm_wk, slave:test0.v_tm_wk]
 include/diff_tables.inc [master:test0.v_ti_wk, slave:test0.v_ti_wk]
-set @@global.mts_exp_slave_local_timestamp= @save.mts_exp_slave_local_timestamp;
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_mixed_parallel_crash_safe-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_mixed_parallel_crash_safe-slave.opt	2011-06-09 17:35:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mixed_parallel_crash_safe-slave.opt	2011-06-16 00:40:41 +0000
@@ -1 +1 @@
---mts-slave-parallel-workers=5 --skip-core-file --skip-slave-start --relay-log-info-repository=TABLE --worker-info-repository=TABLE --slave-transaction-retries=0
+--slave-parallel-workers=5 --skip-core-file --skip-slave-start --relay-log-info-repository=TABLE --slave-worker-info-repository=TABLE --slave-transaction-retries=0

=== modified file 'mysql-test/suite/rpl/t/rpl_row_parallel_crash_safe-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_parallel_crash_safe-slave.opt	2011-06-09 17:35:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_parallel_crash_safe-slave.opt	2011-06-16 00:40:41 +0000
@@ -1 +1 @@
---mts-slave-parallel-workers=5 --skip-core-file --skip-slave-start --relay-log-info-repository=TABLE --worker-info-repository=TABLE --slave-transaction-retries=0
+--slave-parallel-workers=5 --skip-core-file --skip-slave-start --relay-log-info-repository=TABLE --slave-worker-info-repository=TABLE --slave-transaction-retries=0

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_parallel_crash_safe-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_stm_parallel_crash_safe-slave.opt	2011-06-09 17:35:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_parallel_crash_safe-slave.opt	2011-06-16 00:40:41 +0000
@@ -1 +1 @@
---mts-slave-parallel-workers=5 --skip-core-file --skip-slave-start --relay-log-info-repository=TABLE --worker-info-repository=TABLE --slave-transaction-retries=0
+--slave-parallel-workers=5 --skip-core-file --skip-slave-start --relay-log-info-repository=TABLE --slave-worker-info-repository=TABLE --slave-transaction-retries=0

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-next-mr-wl5569 branch (luis.soares:3293 to 3297) WL#5569Luis Soares16 Jun