database-utility
diff --git a/‎.bzr-mysql/default.conf
+1-1 b/‎.bzr-mysql/default.conf
+1-1
diff --git a/‎client/mysqldump.c
+3-1 b/‎client/mysqldump.c
+3-1
diff --git a/‎include/my_pthread.h
+16 b/‎include/my_pthread.h
+16
diff --git a/‎mysql-test/collections/default.push
+13-3 b/‎mysql-test/collections/default.push
+13-3
diff --git a/‎mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
+1 b/‎mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
+1
diff --git a/‎mysql-test/extra/rpl_tests/rpl_conflicts.test
+1 b/‎mysql-test/extra/rpl_tests/rpl_conflicts.test
+1
diff --git a/‎mysql-test/extra/rpl_tests/rpl_crash_safe.inc
+6-2 b/‎mysql-test/extra/rpl_tests/rpl_crash_safe.inc
+6-2
diff --git a/‎mysql-test/extra/rpl_tests/rpl_crash_safe.test
-1 b/‎mysql-test/extra/rpl_tests/rpl_crash_safe.test
-1
diff --git a/‎mysql-test/extra/rpl_tests/rpl_extra_col_master.test
+1 b/‎mysql-test/extra/rpl_tests/rpl_extra_col_master.test
+1
diff --git a/‎mysql-test/extra/rpl_tests/rpl_extra_col_slave.test
+1 b/‎mysql-test/extra/rpl_tests/rpl_extra_col_slave.test
+1
diff --git a/‎mysql-test/extra/rpl_tests/rpl_loaddata.test
+3-1 b/‎mysql-test/extra/rpl_tests/rpl_loaddata.test
+3-1
diff --git a/‎mysql-test/extra/rpl_tests/rpl_mixing_engines.inc
+23-21 b/‎mysql-test/extra/rpl_tests/rpl_mixing_engines.inc
+23-21
diff --git a/‎mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc
+108 b/‎mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc
+108
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@lists.mysql.com"
 post_push_to = "commits@lists.mysql.com"
-tree_name = "mysql-trunk"
+tree_name = "mysql-next-mr-wl5569"
@@ -918,7 +918,9 @@ static int get_options(int *argc, char ***argv)
       my_hash_insert(&ignore_table,
                      (uchar*) my_strdup("mysql.slave_master_info", MYF(MY_WME))) ||
       my_hash_insert(&ignore_table,
-                     (uchar*) my_strdup("mysql.slave_relay_log_info", MYF(MY_WME))))
+                     (uchar*) my_strdup("mysql.slave_relay_log_info", MYF(MY_WME))) ||
+      my_hash_insert(&ignore_table,
+                     (uchar*) my_strdup("mysql.slave_worker_info", MYF(MY_WME))))
     return(EX_EOM);
 
   if ((ho_error= handle_options(argc, argv, my_long_options, get_one_option)))
 
@@ -128,6 +128,8 @@ struct timespec {
   ((TS1.tv.i64 > TS2.tv.i64) ? 1 : \
    ((TS1.tv.i64 < TS2.tv.i64) ? -1 : 0))
 
+#define diff_timespec(TS1, TS2) \
+  ((TS1.tv.i64 - TS2.tv.i64) * 100)
 
 int win_pthread_mutex_trylock(pthread_mutex_t *mutex);
 int pthread_create(pthread_t *, const pthread_attr_t *, pthread_handler, void *);
@@ -455,6 +457,20 @@ int my_pthread_mutex_trylock(pthread_mutex_t *mutex);
    ((TS1.tv_sec < TS2.tv_sec || \
      (TS1.tv_sec == TS2.tv_sec && TS1.tv_nsec < TS2.tv_nsec)) ? -1 : 0))
 #endif /* !cmp_timespec */
+#endif /* HAVE_TIMESPEC_TS_SEC */
+
+#ifdef HAVE_TIMESPEC_TS_SEC
+#ifndef diff_timespec
+#define diff_timespec(TS1, TS2) \
+  (((TS1.ts_sec * 1000000000) + TS1.ts_nsec) - \
+   ((TS2.ts_sec * 1000000000) + TS2.ts_nsec))
+#endif /* !diff_timespec */
+#else
+#ifndef diff_timespec
+#define diff_timespec(TS1, TS2) \
+  (((TS1.tv_sec * 1000000000) + TS1.tv_nsec) - \
+   ((TS2.tv_sec * 1000000000) + TS2.tv_nsec))
+#endif /* !diff_timespec */
 #endif /* HAVE_TIMESPEC_TS_SEC */
 
 	/* safe_mutex adds checking to mutex for easier debugging */
 
@@ -1,3 +1,13 @@
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list --unit-tests
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_ps_row --vardir=var-main-ps_row --suite=main --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb --skip-test-list=collections/disabled-per-push.list
-perl mysql-test-run.pl --timer --force --parallel=auto --comment=main_embedded --vardir=var-main_emebbed  --suite=main --embedded --experimental=collections/default.experimental --skip-ndb
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --experimental=collections/default.experimental --skip-ndb  --unit-tests
+
+perl mysql-test-run.pl --timer --force --parallel=auto --comment=rpl_ps_row --vardir=var-rpl-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb  --suite=rpl
+
+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-mts-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-mts-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_MTS --vardir=var-mts-rpl-stmt --mysqld=--binlog-format=statement --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=ps_row_MTS --vardir=var-mts-ps_row --ps-protocol --mysqld=--binlog-format=row --experimental=collections/default.experimental --skip-ndb  --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0
@@ -389,6 +389,7 @@ CALL mtr.add_suppression("Multi-statement transaction required more than 'max_bi
 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");
 
 connection master;
 TRUNCATE t1;
 
@@ -98,6 +98,7 @@ if (`SELECT @@global.binlog_format != 'ROW' OR @@global.slave_exec_mode = 'STRIC
   --eval SELECT "$err" as 'Last_SQL_Error (expected "duplicate key" error)'
   --enable_query_log
   call mtr.add_suppression("Slave SQL.*Duplicate entry .1. for key .PRIMARY.* Error_code: 1062");
+  call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 
   SELECT * FROM t1;
 
 
@@ -12,8 +12,11 @@ if (`SELECT HEX(@commands) = HEX('configure')`)
   --sync_slave_with_master
   --source include/stop_slave.inc
   SHOW CREATE TABLE mysql.slave_relay_log_info;
+  SHOW CREATE TABLE mysql.slave_worker_info;
   ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
+  ALTER TABLE mysql.slave_worker_info ENGINE= Innodb;
   SHOW CREATE TABLE mysql.slave_relay_log_info;
+  SHOW CREATE TABLE mysql.slave_worker_info;
   --source include/start_slave.inc
 
   connection master;
@@ -104,12 +107,13 @@ if (`SELECT HEX(@commands) != HEX('')`)
   #
   connection master;
   sync_slave_with_master;
+
   --let $slave_after= `SELECT master_log_pos FROM mysql.slave_relay_log_info`
-  connection master;
-  if ($slave_after != $master_after)
+  if (`SELECT $slave_after != $master_after`)
   {
     --echo Slave is out of sync.
     --echo MASTER_BEFORE $master_before MASTER_AFTER $master_after SLAVE_BEFORE $slave_before SLAVE_AFTER $slave_after
+    connection slave;
     --source include/show_rpl_debug_info.inc
     --die
   }
 
@@ -81,7 +81,6 @@
 --echo ###################################################################################
 connection master;
 SET @verbose= 'Y';
-let $engine_type=Innodb;
 SET @commands= 'configure';
 --source extra/rpl_tests/rpl_crash_safe.inc
 
 
@@ -128,6 +128,7 @@ call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.*
 call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054");
 call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072");
 call mtr.add_suppression("Slave SQL.*Column 2 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");
 --enable_query_log
 
 sync_slave_with_master;
 
@@ -15,6 +15,7 @@
 
 call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
 call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. 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");
 
 --echo **** Diff Table Def Start ****
 
 
@@ -71,6 +71,7 @@ connection slave;
 # 1062 = ER_DUP_ENTRY
 call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .10. for key .b.. on query.* Error_code: 1062");
 call mtr.add_suppression("Slave SQL.*Query caused different errors on master and slave.*Error on master:.*error code=1062.*Error on slave:.*Error_code: 0");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 --let $slave_sql_errno= 1062
 --source include/wait_for_slave_sql_error_and_skip.inc
 
@@ -157,10 +158,11 @@ if (`SELECT @@global.binlog_format != 'ROW'`)
 {
   # Query causes error on master but not on slave. This causes the slave to
   # stop with error code 0 (which is wrong: see BUG#57287)
-  --let $slave_sql_errno= 0
+  --let $slave_sql_errno= 0,1742 
   --source include/wait_for_slave_sql_error.inc
   drop table t1, t2;
 }
+
 connection master;
 drop table t1, t2;
 
 
@@ -8,25 +8,15 @@
 if (`SELECT HEX(@commands) = HEX('configure')`)
 {
   connection master;
+  
+  --disable_query_log
+  if ($database_name != 'test')
+  {
+    --eval CREATE DATABASE $database_name
+  }
+  --eval use $database_name
+  --enable_query_log
 
-  SET SQL_LOG_BIN=0;
-  eval CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-  eval CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-  eval CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-  eval CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-  eval CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-  eval CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-  eval CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  eval CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  eval CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  eval CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  eval CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  eval CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  eval SET SQL_LOG_BIN=1;
-
-  connection slave;
-
-  SET SQL_LOG_BIN=0;
   eval CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
   eval CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
   eval CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -39,9 +29,6 @@ if (`SELECT HEX(@commands) = HEX('configure')`)
   eval CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
   eval CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
   eval CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = $engine_type;
-  SET SQL_LOG_BIN=1;
-
-  connection master;
 
   INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
   INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
@@ -150,6 +137,10 @@ if (`SELECT HEX(@commands) = HEX('clean')`)
 {
   connection master;
 
+  --disable_query_log
+  --eval use $database_name
+  --enable_query_log
+
   DROP TABLE tt_1;
   DROP TABLE tt_2;
   DROP TABLE tt_3;
@@ -169,13 +160,24 @@ if (`SELECT HEX(@commands) = HEX('clean')`)
   DROP FUNCTION fc_i_tt_5_suc;
   DROP FUNCTION fc_i_nt_5_suc;
 
+  --disable_query_log
+  if ($database_name != 'test')
+  {
+    --eval DROP DATABASE $database_name
+  }
+  --enable_query_log
+
   sync_slave_with_master;
 
   SET @commands= '';
 }
 
 while (`SELECT HEX(@commands) != HEX('')`)
 {
+  --disable_query_log
+  --eval use $database_name
+  --enable_query_log
+
   --disable_query_log
   SET @command= SUBSTRING_INDEX(@commands, ' ', 1);
   let $command= `SELECT @command`;
 
@@ -0,0 +1,108 @@
+#
+# This file relies on the rpl_mixing_engines.inc which provides an engine
+# to process commands.
+#
+
+#
+# Creates tables used throughout the test and changes the type of the
+# mysql.slave_relay_log_info to Innodb.
+#
+if (`SELECT HEX(@commands) = HEX('configure')`)
+{
+  --let $count_database=1
+  while ($count_database <= $max_workers)
+  {
+    --connection master
+    SET @commands= 'configure';
+    --let $database_name=test_$count_database
+    --source extra/rpl_tests/rpl_mixing_engines.inc
+    inc $count_database;
+  }
+
+  --sync_slave_with_master
+  --source include/stop_slave.inc
+  let $saved_workers= `SELECT @@global.slave_parallel_workers`;
+  let $saved_checkpoint= `SELECT @@global.slave_checkpoint_period`;
+
+  SHOW CREATE TABLE mysql.slave_master_info;
+  SHOW CREATE TABLE mysql.slave_relay_log_info;
+  SHOW CREATE TABLE mysql.slave_worker_info;
+  ALTER TABLE mysql.slave_master_info ENGINE= Innodb;
+  ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
+  ALTER TABLE mysql.slave_worker_info ENGINE= Innodb;
+  SHOW CREATE TABLE mysql.slave_master_info;
+  SHOW CREATE TABLE mysql.slave_relay_log_info;
+  SHOW CREATE TABLE mysql.slave_worker_info;
+}
+
+if (`SELECT HEX(@commands) = HEX('clean')`)
+{
+  --connection slave
+  --source include/stop_slave.inc
+  --disable_query_log
+  eval SET @@global.slave_parallel_workers= $saved_workers;
+  eval SET @@global.slave_checkpoint_period= $saved_checkpoint;
+  --enable_query_log
+  --source include/start_slave.inc
+
+  --connection master
+  --let $count_database=1
+  while ($count_database <= $max_workers)
+  {
+    SET @commands= 'clean';
+    --let $database_name=test_$count_database
+    --source extra/rpl_tests/rpl_mixing_engines.inc
+    inc $count_database;
+  }
+}
+
+if (`SELECT HEX(@commands) = HEX('recovery')`)
+{
+  --connection master
+  let $m_before_master_file= query_get_value("SHOW MASTER STATUS", "File", 1);
+  let $m_before_master_pos= query_get_value("SHOW MASTER STATUS", "Position", 1);
+
+  #### Guaranteeing that all events in the binary log are transfered to the slave ######
+  --connection slave
+  let $saved_current_workers= `SELECT @@global.slave_parallel_workers`;
+  let $saved_current_checkpoint= `SELECT @@global.slave_checkpoint_period`;
+  SET GLOBAL debug="d,rotate_slave_debug_group";
+  --source include/start_slave_io.inc
+  let $wait_condition=SELECT Master_log_pos = $m_before_master_pos AND Master_log_name = "$m_before_master_file" FROM mysql.slave_master_info;
+  --source include/wait_condition.inc
+
+  #### Crashing server after assigning and processing jobs ######
+  --connection slave
+  eval SET @@global.slave_checkpoint_group= $count_debug_groups;
+  SET GLOBAL debug="d,check_slave_debug_group";
+  SET GLOBAL debug="+d,mts_distribute_round_robin";
+  --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
+  --error 0, 2013
+  START SLAVE SQL_THREAD;
+  --source include/wait_until_disconnected.inc
+  --exec echo "restart --skip-slave-start --slave-transaction-retries=0 --relay-log-info-repository=TABLE --master-info-repository=TABLE --sync-master-info=1" > $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
+  --let $rpl_server_number= 2
+  --source include/rpl_reconnect.inc
+
+  #### Checking if the recovery worked and the coordinator has an updated state. ####
+  --connection slave
+  --source include/start_slave_io.inc
+  let $wait_condition=SELECT Master_log_pos = $m_before_master_pos AND Master_log_name = "$m_before_master_file" FROM mysql.slave_master_info;
+  --source include/wait_condition.inc
+
+  --source include/start_slave_sql.inc
+  let $wait_condition=SELECT Master_log_pos = $m_before_master_pos AND Master_log_name = "$m_before_master_file" FROM mysql.slave_relay_log_info;
+  --source include/wait_condition.inc
+
+  --source include/stop_slave.inc
+  eval SET @@global.slave_parallel_workers= $saved_current_workers;
+  eval SET @@global.slave_checkpoint_period= $saved_current_checkpoint;
+
+  SET @command= '';
+}
+
+if (`SELECT HEX(@commands) != HEX('')`)
+{
+  --connection master
+  --source extra/rpl_tests/rpl_mixing_engines.inc
+}