List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:June 15 2011 5:32pm
Subject:bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3291 to 3292) WL#5569
View as plain text  
 3292 Andrei Elkin	2011-06-15
      wl#5569 MTS
      
      correcting --slave-parallel-workers in collections/default.push

    modified:
      mysql-test/collections/default.push
 3291 Andrei Elkin	2011-06-15
      wl#5569 MTS
      
      Cleanup, including
      
      1. decreasing number and renaming system variables.
         Important for debugging command line options are replaced with reasonble constant values 
         and only necessary are retained.
      
      2. Small encapsulation in ha_blackhole.cc is done.
     @ mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test
        cleanup.
     @ mysql-test/extra/rpl_tests/rpl_parallel_load.test
        cleanup.
     @ mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test
        cleanup.
     @ mysql-test/r/mysqld--help-notwin.result
        cleanup.
     @ mysql-test/suite/rpl/r/rpl_parallel_benchmark.result
        cleanup.
     @ mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result
        cleanup.
     @ mysql-test/suite/rpl/r/rpl_parallel_conflicts.result
        cleanup.
     @ mysql-test/suite/rpl/r/rpl_parallel_ddl.result
        cleanup.
     @ mysql-test/suite/rpl/r/rpl_parallel_multi_db.result
        cleanup.
     @ mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result
        cleanup.
     @ mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
        cleanup.
     @ mysql-test/suite/rpl/r/rpl_parallel_temp_query.result
        cleanup.
     @ mysql-test/suite/rpl/t/rpl_parallel.test
        cleanup.
     @ mysql-test/suite/rpl/t/rpl_parallel_benchmark.test
        cleanup.
     @ mysql-test/suite/rpl/t/rpl_parallel_conf_limits.test
        cleanup.
     @ mysql-test/suite/rpl/t/rpl_parallel_conflicts.test
        cleanup.
     @ mysql-test/suite/rpl/t/rpl_parallel_ddl.test
        cleanup.
     @ mysql-test/suite/rpl/t/rpl_parallel_innodb.test
        cleanup.
     @ mysql-test/suite/rpl/t/rpl_parallel_multi_db.test
        cleanup.
     @ mysql-test/suite/rpl/t/rpl_parallel_seconds_behind_master.test
        cleanup.
     @ mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
        cleanup.
     @ mysql-test/suite/rpl/t/rpl_parallel_temp_query.test
        cleanup.
     @ mysql-test/suite/sys_vars/r/all_vars.result
        cleanup.
     @ mysql-test/suite/sys_vars/r/slave_checkpoint_group_basic.result
        cleanup.
     @ mysql-test/suite/sys_vars/r/slave_checkpoint_period_basic.result
        cleanup.
     @ mysql-test/suite/sys_vars/r/slave_worker_info_repository_basic.result
        cleanup.
     @ mysql-test/suite/sys_vars/t/slave_checkpoint_group_basic.test
        cleanup.
     @ mysql-test/suite/sys_vars/t/slave_checkpoint_period_basic.test
        cleanup.
     @ sql/log_event.cc
        removing experimental (for benchmarking) mts_slave_local_timestamp option.
     @ sql/mysqld.cc
        few debugging time options are replaced with constants.
        Interface-variables are non needed anymore.
     @ sql/mysqld.h
        few debugging time options are replaced with constants.
        Interface-variables are non needed anymore.
     @ sql/rpl_rli_pdb.cc
        few debugging time options are replaced with constants.
     @ sql/rpl_slave.cc
        few debugging time options are replaced with constants.
     @ sql/sys_vars.cc
        few debugging time options are replaced with constants;
        renaming the rest that deal with MTS to be prefixed with `slave_'.

    renamed:
      mysql-test/include/not_worker_info_table.inc => mysql-test/include/not_slave_worker_info_table.inc
      mysql-test/suite/sys_vars/r/mts_checkpoint_group_basic.result => mysql-test/suite/sys_vars/r/slave_checkpoint_group_basic.result
      mysql-test/suite/sys_vars/r/mts_checkpoint_period_basic.result => mysql-test/suite/sys_vars/r/slave_checkpoint_period_basic.result
      mysql-test/suite/sys_vars/r/worker_info_repository_basic.result => mysql-test/suite/sys_vars/r/slave_worker_info_repository_basic.result
      mysql-test/suite/sys_vars/t/mts_checkpoint_group_basic.test => mysql-test/suite/sys_vars/t/slave_checkpoint_group_basic.test
      mysql-test/suite/sys_vars/t/mts_checkpoint_period_basic.test => mysql-test/suite/sys_vars/t/slave_checkpoint_period_basic.test
      mysql-test/suite/sys_vars/t/worker_info_repository_basic.test => mysql-test/suite/sys_vars/t/slave_worker_info_repository_basic.test
    modified:
      mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test
      mysql-test/extra/rpl_tests/rpl_parallel_load.test
      mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/rpl/r/rpl_parallel_benchmark.result
      mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result
      mysql-test/suite/rpl/r/rpl_parallel_conflicts.result
      mysql-test/suite/rpl/r/rpl_parallel_ddl.result
      mysql-test/suite/rpl/r/rpl_parallel_innodb.result
      mysql-test/suite/rpl/r/rpl_parallel_multi_db.result
      mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      mysql-test/suite/rpl/r/rpl_parallel_temp_query.result
      mysql-test/suite/rpl/t/rpl_parallel.test
      mysql-test/suite/rpl/t/rpl_parallel_benchmark.test
      mysql-test/suite/rpl/t/rpl_parallel_conf_limits.test
      mysql-test/suite/rpl/t/rpl_parallel_conflicts.test
      mysql-test/suite/rpl/t/rpl_parallel_ddl.test
      mysql-test/suite/rpl/t/rpl_parallel_innodb.test
      mysql-test/suite/rpl/t/rpl_parallel_multi_db.test
      mysql-test/suite/rpl/t/rpl_parallel_seconds_behind_master.test
      mysql-test/suite/rpl/t/rpl_parallel_start_stop.test
      mysql-test/suite/rpl/t/rpl_parallel_temp_query.test
      mysql-test/suite/sys_vars/r/all_vars.result
      sql/log_event.cc
      sql/mysqld.cc
      sql/mysqld.h
      sql/rpl_rli_pdb.cc
      sql/rpl_slave.cc
      sql/sys_vars.cc
      storage/blackhole/ha_blackhole.cc
      mysql-test/include/not_slave_worker_info_table.inc
      mysql-test/suite/sys_vars/r/slave_checkpoint_group_basic.result
      mysql-test/suite/sys_vars/r/slave_checkpoint_period_basic.result
      mysql-test/suite/sys_vars/r/slave_worker_info_repository_basic.result
      mysql-test/suite/sys_vars/t/slave_checkpoint_group_basic.test
      mysql-test/suite/sys_vars/t/slave_checkpoint_period_basic.test
      mysql-test/suite/sys_vars/t/slave_worker_info_repository_basic.test
=== modified file 'mysql-test/collections/default.push'
--- a/mysql-test/collections/default.push	2011-06-12 19:33:32 +0000
+++ b/mysql-test/collections/default.push	2011-06-15 17:31:46 +0000
@@ -4,8 +4,8 @@ perl mysql-test-run.pl --timer --force -
 
 perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_stmt --vardir=var-rpl-stmt --mysqld=--binlog-format=statement --experimental=collections/default.experimental --skip-ndb  --suite=rpl
 
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_n_mix_MTS --vardir=var-rpl-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb  --unit-tests --mysqld=--mts-slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_n_mix_MTS --vardir=var-rpl-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb  --unit-tests --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
 
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_ps_row_MTS --vardir=var-rpl-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb  --mysqld=--mts-slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_ps_row_MTS --vardir=var-rpl-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb  --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
 
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_stmt_rpl_MTS --vardir=var-rpl-stmt --mysqld=--binlog-format=statement --experimental=collections/default.experimental --skip-ndb  --mysqld=--mts-slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_stmt_rpl_MTS --vardir=var-rpl-stmt --mysqld=--binlog-format=statement --experimental=collections/default.experimental --skip-ndb  --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl


Attachment: [text/bzr-bundle] bzr/andrei.elkin@oracle.com-20110615173146-vd74iewkwu3infic.bundle
Thread
bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3291 to 3292) WL#5569Andrei Elkin16 Jun