bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3292 to 3293) WL#5569

[Andrei Elkin]

 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
 3292 Andrei Elkin	2011-06-15
      wl#5569 MTS
      
      correcting --slave-parallel-workers in collections/default.push

    modified:
      mysql-test/collections/default.push
=== modified file 'mysql-test/include/not_mts_slave_parallel_workers.inc'
--- a/mysql-test/include/not_mts_slave_parallel_workers.inc	2010-12-22 15:01:47 +0000
+++ b/mysql-test/include/not_mts_slave_parallel_workers.inc	2011-06-15 17:41:33 +0000
@@ -1,4 +1,4 @@
-if (`SELECT @@GLOBAL.mts_slave_parallel_workers != 0`)
+if (`SELECT @@GLOBAL.slave_parallel_workers != 0`)
 {
      skip Test cannot run with MTS;
 }

=== modified file 'mysql-test/suite/rpl/r/rpl_sequential.result'
--- a/mysql-test/suite/rpl/r/rpl_sequential.result	2011-04-06 12:51:58 +0000
+++ b/mysql-test/suite/rpl/r/rpl_sequential.result	2011-06-15 17:41:33 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 [connection master]
 set @save.mts_slave_parallel_workers= 0;
-select @@global.mts_slave_parallel_workers as 'zero';
+select @@global.slave_parallel_workers as 'zero';
 zero
 0
 call mtr.add_suppression('Slave: Error dropping database');
@@ -80,5 +80,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_sequential.test'
--- a/mysql-test/suite/rpl/t/rpl_sequential.test	2010-12-27 18:54:41 +0000
+++ b/mysql-test/suite/rpl/t/rpl_sequential.test	2011-06-15 17:41:33 +0000
@@ -11,7 +11,7 @@
 connection slave;
 
 set @save.mts_slave_parallel_workers= 0;
-select @@global.mts_slave_parallel_workers as 'zero';
+select @@global.slave_parallel_workers as 'zero';
 
 connection master;
 


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