List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:June 17 2011 3:34pm
Subject:bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3302 to 3303) WL#5569
View as plain text  
 3303 Andrei Elkin	2011-06-17
      wl#5569 MTS
      
      fixing tests.
     @ mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test
        making aux file names unique to please mtr, pb.
     @ mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test
        making aux file names unique to please mtr, pb.
     @ mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
        MTS-suppression is added.
     @ mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
        MTS-suppression is added.
     @ mysql-test/suite/rpl/r/rpl_parallel_benchmark.result
        making aux file names unique to please mtr, pb.
     @ mysql-test/suite/rpl/r/rpl_parallel_innodb.result
        making aux file names unique to please mtr, pb.
     @ mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
        MTS-suppression is added.
     @ mysql-test/suite/rpl/r/rpl_typeconv.result
        MTS-suppression is added.
     @ mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
        MTS-suppression is added.
     @ mysql-test/suite/rpl/t/rpl_parallel_benchmark-slave.opt
        cleanup.
     @ mysql-test/suite/rpl/t/rpl_typeconv.test
        MTS-suppression is added.
     @ mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result
        results updated.
     @ sql/sql_class.h
        Cleanup to remove early debug-related options.
     @ sql/sys_vars.cc
        Fixating slave_parallel_workers' max as 1024.
        Cleanup to remove early debug-related options.

    modified:
      mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test
      mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test
      mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_parallel_benchmark.result
      mysql-test/suite/rpl/r/rpl_parallel_innodb.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_typeconv.result
      mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
      mysql-test/suite/rpl/t/rpl_parallel_benchmark-slave.opt
      mysql-test/suite/rpl/t/rpl_typeconv.test
      mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result
      sql/sql_class.h
      sql/sys_vars.cc
 3302 Andrei Elkin	2011-06-17
      wl#5569 MTS
      
      fixing rpl_row_basic_3innodb similarly to the previous patch.
     @ mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
        a suppression is added.

    modified:
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
=== modified file 'mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test'
--- a/mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test	2011-06-15 17:12:11 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test	2011-06-17 15:34:16 +0000
@@ -265,22 +265,22 @@ let $wait_timeout= 600;
 let $wait_condition= SELECT count(*)+sleep(1) = 5 FROM test1.benchmark;
 source include/wait_condition.inc;
 
-
-let $MYSQLD_DATADIR= `select @@datadir`;
-
 # cleanup for files that could not be removed in the end of previous invocation.
+let $MYSQLD_DATADIR= `select @@datadir`;
 --remove_files_wildcard $MYSQLD_DATADIR *.out
 
 use test;
---replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
-eval select * from test1.benchmark into outfile '$MYSQLD_DATADIR/benchmark.out';
+let $benchmark_file= `select replace(concat("benchmark_",uuid(),".out"),"-","_")`;
+--replace_regex /benchmark_.*.out/benchmark.out/
+eval select * from test1.benchmark into outfile  '$benchmark_file';
 select ts from test1.benchmark where state like 'master started load' into @m_0;
 select ts from test1.benchmark where state like 'master ends load' into @m_1;
 select ts from test1.benchmark where state like 'slave takes on load' into @s_0;
 select ts from test1.benchmark where state like 'slave ends load' into @s_1;
---replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
+let $delta_file= `select replace(concat("delta_",uuid(),".out"),"-","_")`;
+--replace_regex /delta_.*.out/delta.out/
 eval select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta_m', 
-       time_to_sec(@s_1) - time_to_sec(@s_0) as 'delta_s' into outfile '$MYSQLD_DATADIR/delta.out';
+       time_to_sec(@s_1) - time_to_sec(@s_0) as 'delta_s' into outfile '$delta_file';
 
 --enable_result_log
 --enable_query_log

=== modified file 'mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test'
--- a/mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test	2011-06-15 17:12:11 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test	2011-06-17 15:34:16 +0000
@@ -277,8 +277,14 @@ source include/wait_condition.inc;
 use test0;
 insert into benchmark set state='slave ends load';
 
+# cleanup for files that could not be removed in the end of previous invocation.
+let $MYSQLD_DATADIR= `select @@datadir`;
+--remove_files_wildcard $MYSQLD_DATADIR *.out
+
 use test;
-select * from test0.benchmark into outfile 'benchmark.out';
+let $benchmark_file= `select replace(concat("benchmark_",uuid(),".out"),"-","_")`;
+--replace_regex /benchmark_.*.out/benchmark.out/
+eval select * from test1.benchmark into outfile  '$benchmark_file';
 select ts from test0.benchmark where state like 'master started load' into @m_0;
 select ts from test0.benchmark where state like 'master ends load' into @m_1;
 select ts from test0.benchmark where state like 'slave takes on load' into @s_m0;
@@ -286,9 +292,11 @@ select ts from test0.benchmark where sta
 
 select ts from test0.benchmark where state like 'slave ends load' into @s_1;
 select ts from test0.benchmark where state like 'slave is processing load' into @s_0;
-select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta_m', 
+let $delta_file= `select replace(concat("delta_",uuid(),".out"),"-","_")`;
+--replace_regex /delta_.*.out/delta.out/
+eval select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta_m', 
        time_to_sec(@s_1) - time_to_sec(@s_0) as 'delta_s',
-       time_to_sec(@s_m1) - time_to_sec(@s_m0) as 'delta_sm'  into outfile 'delta.out';
+       time_to_sec(@s_m1) - time_to_sec(@s_m0) as 'delta_sm'  into outfile '$delta_file';
 
 
 let $i = $databases + 1;

=== modified file 'mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result'
--- a/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result	2011-02-23 09:31:37 +0000
+++ b/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result	2011-06-17 15:34:16 +0000
@@ -43,6 +43,7 @@ UPDATE t4 LEFT JOIN (t1, t6, t7) ON (t4.
 UPDATE t7 LEFT JOIN (t4, t1, t2) ON (t7.id=t4.id and t7.id=t1.id and t7.id=t2.id) SET a=0, b=0, d=0, g=0 where t7.id=1;
 UPDATE t7 LEFT JOIN (t8, t4, t1) ON (t7.id=t8.id and t7.id=t4.id and t7.id=t1.id) SET a=0, d=0, g=0, h=0 where t7.id=1;
 call mtr.add_suppression("Slave SQL.*Error .Table .test.t[47]. doesn.t exist. on query.* Error_code: 1146");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0 where t1.id=1;
 include/wait_for_slave_sql_error_and_skip.inc [errno=1146]
 Last_SQL_Error = 'Error 'Table 'test.t4' doesn't exist' on query. Default database: 'test'. Query: 'UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0 where t1.id=1''

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result	2011-06-17 15:34:16 +0000
@@ -141,6 +141,7 @@ CALL mtr.add_suppression("Multi-statemen
 CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_stmt_cache_size' bytes of storage.*");
 CALL mtr.add_suppression("Writing one row to the row-based binary log failed.*");
 CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master. Message: error writing to the binary log");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 TRUNCATE t1;
 SET GLOBAL max_binlog_cache_size= ORIGINAL_VALUE;
 SET GLOBAL binlog_cache_size= ORIGINAL_VALUE;

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_benchmark.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_benchmark.result	2011-06-15 17:12:11 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_benchmark.result	2011-06-17 15:34:16 +0000
@@ -6,11 +6,10 @@ include/stop_slave.inc
 start slave;
 stop slave sql_thread;
 use test;
-select * from test1.benchmark into outfile 'MYSQLD_DATADIR/benchmark.out';
+select * from test1.benchmark into outfile  'benchmark.out';
 select ts from test1.benchmark where state like 'master started load' into @m_0;
 select ts from test1.benchmark where state like 'master ends load' into @m_1;
 select ts from test1.benchmark where state like 'slave takes on load' into @s_0;
 select ts from test1.benchmark where state like 'slave ends load' into @s_1;
-select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta_m', 
-time_to_sec(@s_1) - time_to_sec(@s_0) as 'delta_s' into outfile 'MYSQLD_DATADIR/delta.out';
+select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta.out';
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_innodb.result	2011-06-15 17:12:11 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_innodb.result	2011-06-17 15:34:16 +0000
@@ -7,16 +7,14 @@ stop slave sql_thread;
 use test0;
 insert into benchmark set state='slave ends load';
 use test;
-select * from test0.benchmark into outfile 'benchmark.out';
+select * from test1.benchmark into outfile  'benchmark.out';
 select ts from test0.benchmark where state like 'master started load' into @m_0;
 select ts from test0.benchmark where state like 'master ends load' into @m_1;
 select ts from test0.benchmark where state like 'slave takes on load' into @s_m0;
 select ts from test0.benchmark where state like 'slave is supposed to finish with load' into @s_m1;
 select ts from test0.benchmark where state like 'slave ends load' into @s_1;
 select ts from test0.benchmark where state like 'slave is processing load' into @s_0;
-select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta_m', 
-time_to_sec(@s_1) - time_to_sec(@s_0) as 'delta_s',
-time_to_sec(@s_m1) - time_to_sec(@s_m0) as 'delta_sm'  into outfile 'delta.out';
+select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta.out';
 include/diff_tables.inc [master:test15.v_ti_nk, slave:test15.v_ti_nk]
 include/diff_tables.inc [master:test15.v_ti_wk, slave:test15.v_ti_wk]
 include/diff_tables.inc [master:test14.v_ti_nk, slave:test14.v_ti_nk]

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result	2011-02-23 20:01:27 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result	2011-06-17 15:34:16 +0000
@@ -141,6 +141,7 @@ CALL mtr.add_suppression("Multi-statemen
 CALL mtr.add_suppression("Multi-statement transaction required more than 'max_binlog_stmt_cache_size' bytes of storage.*");
 CALL mtr.add_suppression("Writing one row to the row-based binary log failed.*");
 CALL mtr.add_suppression("Slave SQL.*The incident LOST_EVENTS occured on the master. Message: error writing to the binary log");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 TRUNCATE t1;
 SET GLOBAL max_binlog_cache_size= ORIGINAL_VALUE;
 SET GLOBAL binlog_cache_size= ORIGINAL_VALUE;

=== modified file 'mysql-test/suite/rpl/r/rpl_typeconv.result'
--- a/mysql-test/suite/rpl/r/rpl_typeconv.result	2011-05-11 07:49:23 +0000
+++ b/mysql-test/suite/rpl/r/rpl_typeconv.result	2011-06-17 15:34:16 +0000
@@ -535,6 +535,7 @@ BIT(5)         	BIT(12)        	ALL_LOSS
 BIT(12)        	BIT(5)         	ALL_LOSSY,ALL_NON_LOSSY  	<Correct value>
 DROP TABLE type_conversions;
 call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 DROP TABLE t1;
 set global slave_type_conversions = @saved_slave_type_conversions;
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test'
--- a/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test	2011-02-23 09:31:37 +0000
+++ b/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test	2011-06-17 15:34:16 +0000
@@ -124,6 +124,7 @@ UPDATE t7 LEFT JOIN (t8, t4, t1) ON (t7.
 sync_slave_with_master;
 connection slave;
 call mtr.add_suppression("Slave SQL.*Error .Table .test.t[47]. doesn.t exist. on query.* Error_code: 1146");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 connection master;
 
 # Parameters for include/wait_for_slave_sql_error_and_skip.inc:

=== modified file 'mysql-test/suite/rpl/t/rpl_parallel_benchmark-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_parallel_benchmark-slave.opt	2011-06-17 10:51:59 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_benchmark-slave.opt	2011-06-17 15:34:16 +0000
@@ -1,3 +1 @@
 --log-warnings=0 --slave-transaction-retries=0
-
-

=== modified file 'mysql-test/suite/rpl/t/rpl_typeconv.test'
--- a/mysql-test/suite/rpl/t/rpl_typeconv.test	2011-05-11 07:49:23 +0000
+++ b/mysql-test/suite/rpl/t/rpl_typeconv.test	2011-06-17 15:34:16 +0000
@@ -62,6 +62,7 @@ enable_query_log;
 DROP TABLE type_conversions;
 
 call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
 connection master;
 DROP TABLE t1;

=== modified file 'mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result'
--- a/mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result	2011-06-16 08:29:53 +0000
+++ b/mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result	2011-06-17 15:34:16 +0000
@@ -25,5 +25,5 @@ Warnings:
 Warning	1292	Truncated incorrect slave_parallel_workers value: '18446744073709551615'
 select @@global.slave_parallel_workers;
 @@global.slave_parallel_workers
-4294967295
+1024
 set @@global.slave_parallel_workers= @save.slave_parallel_workers;

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2011-06-12 19:05:05 +0000
+++ b/sql/sql_class.h	2011-06-17 15:34:16 +0000
@@ -58,7 +58,6 @@ enum enum_delay_key_write { DELAY_KEY_WR
 			    DELAY_KEY_WRITE_ALL };
 enum enum_slave_exec_mode { SLAVE_EXEC_MODE_STRICT,
                             SLAVE_EXEC_MODE_IDEMPOTENT,
-                            SLAVE_EXEC_MODE_LOCAL_TIMESTAMP,
                             SLAVE_EXEC_MODE_LAST_BIT };
 enum enum_slave_type_conversions { SLAVE_TYPE_CONVERSIONS_ALL_LOSSY,
                                    SLAVE_TYPE_CONVERSIONS_ALL_NON_LOSSY};

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2011-06-16 16:46:22 +0000
+++ b/sql/sys_vars.cc	2011-06-17 15:34:16 +0000
@@ -2085,7 +2085,7 @@ static Sys_var_mybool Sys_slave_compress
 
 #ifdef HAVE_REPLICATION
 static const char *slave_exec_mode_names[]=
-       {"STRICT", "IDEMPOTENT", "PARALLEL", "LOCAL_TIMESTAMP", 0};
+       {"STRICT", "IDEMPOTENT", 0};
 static Sys_var_enum Slave_exec_mode(
        "slave_exec_mode",
        "Modes for how replication events should be executed. Legal values "
@@ -3353,7 +3353,7 @@ static Sys_var_ulong Sys_slave_parallel_
        "slave_parallel_workers",
        "Number of worker threads for executing events in parallel ",
        GLOBAL_VAR(opt_mts_slave_parallel_workers), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(0, UINT_MAX), DEFAULT(0), BLOCK_SIZE(1));
+       VALID_RANGE(0, 1024), DEFAULT(0), BLOCK_SIZE(1));
 
 static Sys_var_ulonglong Sys_mts_pending_jobs_size_max(
        "slave_pending_jobs_size_max",


Attachment: [text/bzr-bundle] bzr/andrei.elkin@oracle.com-20110617153416-hk6xi35y36toougb.bundle
Thread
bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3302 to 3303) WL#5569Andrei Elkin19 Jun