3261 Alfranio Correia 2010-12-23
wl#5569
Fixing tests failure when mtr runs --mts_slave_parallel_workers != 0.
@ sql/rpl_slave.cc
identifying, marking, running carefully ev->update_pos() and destroying
an event that can split a group of events.
added:
mysql-test/suite/rpl/t/rpl_parallel_conf_limits-slave.opt
mysql-test/suite/rpl/t/rpl_parallel_conflicts-slave.opt
modified:
sql/rpl_rli.cc
sql/rpl_slave.cc
3260 Alfranio Correia 2010-12-22
WL#5599
Updated rpl_mixing_engines.inc in order to introduce new test cases for the WL#5599 and
disabled test cases that are incompatible with MTS.
modified:
mysql-test/extra/rpl_tests/rpl_mixing_engines.inc
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result
mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
mysql-test/suite/rpl/r/rpl_mixed_parallel_crash_safe.result
mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result
mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result
mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
mysql-test/suite/rpl/r/rpl_parallel.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_start_stop.result
mysql-test/suite/rpl/r/rpl_row_crash_safe.result
mysql-test/suite/rpl/r/rpl_row_mixing_engines.result
mysql-test/suite/rpl/r/rpl_row_parallel_crash_safe.result
mysql-test/suite/rpl/r/rpl_stm_crash_safe.result
mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
mysql-test/suite/rpl/r/rpl_stm_parallel_crash_safe.result
mysql-test/suite/rpl/t/rpl_migration_crash_safe.test
mysql-test/suite/rpl/t/rpl_mixed_parallel_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_parallel-slave.opt
mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt
mysql-test/suite/rpl/t/rpl_row_parallel_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_sequential.test
mysql-test/suite/rpl/t/rpl_server_id2.test
mysql-test/suite/rpl/t/rpl_stm_parallel_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_temporary_errors.test
=== added file 'mysql-test/suite/rpl/t/rpl_parallel_conf_limits-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_parallel_conf_limits-slave.opt 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_conf_limits-slave.opt 2010-12-23 10:35:28 +0000
@@ -0,0 +1 @@
+--slave-transaction-retries=0
=== added file 'mysql-test/suite/rpl/t/rpl_parallel_conflicts-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_parallel_conflicts-slave.opt 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_conflicts-slave.opt 2010-12-23 10:35:28 +0000
@@ -0,0 +1 @@
+--slave-transaction-retries=0
=== modified file 'sql/rpl_rli.cc'
--- a/sql/rpl_rli.cc 2010-12-22 11:57:18 +0000
+++ b/sql/rpl_rli.cc 2010-12-23 10:35:28 +0000
@@ -72,7 +72,7 @@ Relay_log_info::Relay_log_info(bool is_s
this_worker(NULL), slave_parallel_workers(0),
recovery_parallel_workers(0),
checkpoint_group(mts_checkpoint_group), mts_recovery_group_cnt(0),
- mts_recovery_index(0),
+ mts_recovery_index(0), curr_event_is_not_in_group(0),
sql_delay(0), sql_delay_end(0), m_flags(0)
{
DBUG_ENTER("Relay_log_info::Relay_log_info");
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc 2010-12-22 18:34:26 +0000
+++ b/sql/rpl_slave.cc 2010-12-23 10:35:28 +0000
@@ -3766,6 +3766,7 @@ pthread_handler_t handle_slave_worker(vo
rli->info_thd->awake(THD::KILL_QUERY); // notify Crdn
mysql_mutex_unlock(&rli->info_thd->LOCK_thd_data);
// Todo: add necessary stuff to clean up after Q-log-event, a Q trans
+ thd->clear_error();
rli->cleanup_context(thd, error);
}
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-next-mr-wl5569 branch (alfranio.correia:3260 to 3261)WL#5569 | Alfranio Correia | 23 Dec |
