#At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped
3261 Andrei Elkin 2010-12-23 [merge]
wl#5569 MTS merging from the repo.
added:
mysql-test/suite/rpl/t/rpl_parallel_conf_limits-slave.opt
mysql-test/suite/rpl/t/rpl_parallel_conflicts-slave.opt
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
sql/rpl_rli.cc
sql/rpl_slave.cc
=== modified file 'mysql-test/extra/rpl_tests/rpl_mixing_engines.inc'
--- a/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc 2010-09-24 11:34:21 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc 2010-12-22 19:19:17 +0000
@@ -9,7 +9,6 @@ if (`SELECT HEX(@commands) = HEX('config
{
connection master;
- 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;
@@ -22,26 +21,6 @@ if (`SELECT HEX(@commands) = HEX('config
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;
- 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;
- 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);
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result 2010-12-21 17:30:50 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result 2010-12-22 19:19:17 +0000
@@ -179,12 +179,13 @@ def mysql slave_relay_log_info Number_of
def mysql slave_relay_log_info Relay_log_name 3 NULL NO text 65535 65535 NULL NULL utf8 utf8_bin text select,insert,update,references
def mysql slave_relay_log_info Relay_log_pos 4 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned select,insert,update,references
def mysql slave_relay_log_info Sql_delay 7 NULL NO int NULL NULL 10 0 NULL NULL int(11) select,insert,update,references
-def mysql slave_worker_info Checkpoint_group_bitmap 12 NULL NO blob 65535 65535 NULL NULL NULL NULL blob select,insert,update,references
-def mysql slave_worker_info Checkpoint_group_size 11 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned select,insert,update,references
+def mysql slave_worker_info Checkpoint_group_bitmap 13 NULL NO blob 65535 65535 NULL NULL NULL NULL blob select,insert,update,references
+def mysql slave_worker_info Checkpoint_group_size 12 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned select,insert,update,references
def mysql slave_worker_info Checkpoint_master_log_name 9 NULL NO text 65535 65535 NULL NULL utf8 utf8_bin text select,insert,update,references
def mysql slave_worker_info Checkpoint_master_log_pos 10 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned select,insert,update,references
def mysql slave_worker_info Checkpoint_relay_log_name 7 NULL NO text 65535 65535 NULL NULL utf8 utf8_bin text select,insert,update,references
def mysql slave_worker_info Checkpoint_relay_log_pos 8 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned select,insert,update,references
+def mysql slave_worker_info Checkpoint_seqno 11 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned select,insert,update,references
def mysql slave_worker_info Master_id 1 NULL NO int NULL NULL 10 0 NULL NULL int(10) unsigned PRI select,insert,update,references
def mysql slave_worker_info Master_log_name 5 NULL NO text 65535 65535 NULL NULL utf8 utf8_bin text select,insert,update,references
def mysql slave_worker_info Master_log_pos 6 NULL NO bigint NULL NULL 20 0 NULL NULL bigint(20) unsigned select,insert,update,references
@@ -524,6 +525,7 @@ NULL mysql slave_worker_info Master_log_
NULL mysql slave_worker_info Checkpoint_relay_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned
1.0000 mysql slave_worker_info Checkpoint_master_log_name text 65535 65535 utf8 utf8_bin text
NULL mysql slave_worker_info Checkpoint_master_log_pos bigint NULL NULL NULL NULL bigint(20) unsigned
+NULL mysql slave_worker_info Checkpoint_seqno int NULL NULL NULL NULL int(10) unsigned
NULL mysql slave_worker_info Checkpoint_group_size int NULL NULL NULL NULL int(10) unsigned
1.0000 mysql slave_worker_info Checkpoint_group_bitmap blob 65535 65535 NULL NULL blob
NULL mysql slow_log start_time timestamp NULL NULL NULL NULL timestamp
=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result 2010-12-15 17:46:05 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result 2010-12-22 19:19:17 +0000
@@ -27,7 +27,6 @@ slave_relay_log_info CREATE TABLE `slave
`Number_of_workers` int(10) unsigned NOT NULL,
PRIMARY KEY (`Master_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
-SET SQL_LOG_BIN=0;
CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -40,21 +39,6 @@ CREATE TABLE tt_3 (trans_id INT, stmt_id
CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
-SET SQL_LOG_BIN=0;
-CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_3(trans_id, stmt_id) VALUES(1,1);
=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result 2010-10-26 09:10:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result 2010-12-22 19:19:17 +0000
@@ -10,7 +10,6 @@ start slave;
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
SET @verbose= 'Y';
SET @commands= 'configure';
-SET SQL_LOG_BIN=0;
CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -23,21 +22,6 @@ CREATE TABLE tt_3 (trans_id INT, stmt_id
CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
-SET SQL_LOG_BIN=0;
-CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_3(trans_id, stmt_id) VALUES(1,1);
=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_parallel_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_parallel_crash_safe.result 2010-12-22 15:01:47 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_parallel_crash_safe.result 2010-12-22 19:19:17 +0000
@@ -4,8 +4,6 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
call mtr.add_suppression('Attempting backtrace');
call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
@@ -29,7 +27,6 @@ slave_relay_log_info CREATE TABLE `slave
`Number_of_workers` int(10) unsigned NOT NULL,
PRIMARY KEY (`Master_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
-SET SQL_LOG_BIN=0;
CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -42,21 +39,6 @@ CREATE TABLE tt_3 (trans_id INT, stmt_id
CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
-SET SQL_LOG_BIN=0;
-CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_3(trans_id, stmt_id) VALUES(1,1);
@@ -161,11 +143,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -187,11 +165,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -215,11 +189,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -247,11 +217,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -287,11 +253,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-trig C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -329,11 +291,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-func C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -371,11 +329,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-proc C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -411,11 +365,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-trig T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -453,11 +403,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-func T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -495,11 +441,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-proc T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -521,11 +463,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -547,11 +485,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -575,11 +509,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -607,11 +537,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -647,11 +573,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-trig C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -689,11 +611,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-func C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -731,11 +649,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-proc C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -771,11 +685,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-trig T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -813,11 +723,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-func T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -855,11 +761,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-proc T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -881,11 +783,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -907,11 +805,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -935,11 +829,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -967,11 +857,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1007,11 +893,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-trig C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1049,11 +931,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-func C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1091,11 +969,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-proc C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1131,11 +1005,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-trig T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1173,11 +1043,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-func T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1215,11 +1081,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-proc T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
###################################################################################
# EXECUTE CASES CRASHING THE BEGIN/COMMIT
###################################################################################
@@ -1245,11 +1107,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Query # # COMMIT
-e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1271,11 +1129,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Query # # COMMIT
-e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1299,11 +1153,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Query # # COMMIT
-e-e-e-e-e-e-e-e-e-e-e- >> N-func << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
###################################################################################
# CHECK CONSISTENCY
###################################################################################
=== modified file 'mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result 2010-10-26 09:10:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result 2010-12-22 19:19:17 +0000
@@ -10,7 +10,6 @@ start slave;
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
SET @verbose= 'Y';
SET @commands= 'configure';
-SET SQL_LOG_BIN=0;
CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -23,21 +22,6 @@ CREATE TABLE tt_3 (trans_id INT, stmt_id
CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
-SET SQL_LOG_BIN=0;
-CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_3(trans_id, stmt_id) VALUES(1,1);
=== modified file 'mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result 2010-10-26 09:10:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result 2010-12-22 19:19:17 +0000
@@ -10,7 +10,6 @@ start slave;
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
SET @verbose= 'Y';
SET @commands= 'configure';
-SET SQL_LOG_BIN=0;
CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -23,21 +22,6 @@ CREATE TABLE tt_3 (trans_id INT, stmt_id
CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
-SET SQL_LOG_BIN=0;
-CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_3(trans_id, stmt_id) VALUES(1,1);
=== modified file 'mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result 2010-10-26 09:10:59 +0000
+++ b/mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result 2010-12-22 19:19:17 +0000
@@ -10,7 +10,6 @@ start slave;
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
SET @verbose= 'Y';
SET @commands= 'configure';
-SET SQL_LOG_BIN=0;
CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -23,21 +22,6 @@ CREATE TABLE tt_3 (trans_id INT, stmt_id
CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
-SET SQL_LOG_BIN=0;
-CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_3(trans_id, stmt_id) VALUES(1,1);
=== modified file 'mysql-test/suite/rpl/r/rpl_parallel.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel.result 2010-12-16 21:41:45 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel.result 2010-12-22 19:19:17 +0000
@@ -4,8 +4,6 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers;
select @@global.mts_slave_parallel_workers as 'non-zero means parallel';
non-zero means parallel
@@ -13,8 +11,6 @@ non-zero means parallel
call mtr.add_suppression('Slave: Error dropping database');
include/stop_slave.inc
start slave;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
stop slave sql_thread;
use test;
select * from test0.benchmark into outfile 'benchmark.out';
=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result 2010-12-18 00:33:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result 2010-12-22 19:19:17 +0000
@@ -12,8 +12,6 @@ set @save.mts_slave_parallel_workers= @@
set @@global.mts_slave_parallel_workers= 4;
set @save_mts_slave_worker_queue_len_max= @@global.mts_slave_worker_queue_len_max;
set @@global.mts_slave_worker_queue_len_max= 5;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
include/start_slave.inc
create database d0;
create table d0.t1 (a int auto_increment primary key) engine=innodb;
@@ -34,8 +32,6 @@ set @@global.mts_slave_worker_queue_len_
include/stop_slave.inc
set @save_mts_pending_jobs_size_max = @@global.mts_pending_jobs_size_max;
set @@global.mts_pending_jobs_size_max= 1024;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
include/start_slave.inc
create table d0.t2 (a int auto_increment primary key, b text null) engine=innodb;
begin;
=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_conflicts.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_conflicts.result 2010-12-14 08:57:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_conflicts.result 2010-12-22 19:19:17 +0000
@@ -8,8 +8,6 @@ create view coord_wait_list as SELECT i
include/stop_slave.inc
set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers;
set @@global.mts_slave_parallel_workers= 4;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
include/start_slave.inc
create database d1;
create database d2;
=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_start_stop.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_start_stop.result 2010-12-14 08:57:16 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_start_stop.result 2010-12-22 19:19:17 +0000
@@ -10,26 +10,18 @@ create view coord_proc_list as SELECT i
include/stop_slave.inc
set @save.mts_slave_parallel_workers= @@global.mts_slave_parallel_workers;
set @@global.mts_slave_parallel_workers= 4;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
include/start_slave.inc
select min(id) from worker_proc_list into @w_id;
kill query @w_id;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
include/start_slave.inc
select id from coord_proc_list into @c_id;
kill query @c_id;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
include/start_slave.inc
CREATE TABLE t1 (a int primary key) engine=innodb;
insert into t1 values (1),(2);
insert into t1 values (3);
insert into t1 values (3);
delete from t1 where a=3;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
include/start_slave.inc
delete from t1;
insert into t1 values (1),(2),(3);
@@ -45,8 +37,6 @@ update t1 set a=30 where a=3;
commit;
update t1 set a=21 where a=2;
rollback;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
include/start_slave.inc
stop slave sql_thread;
set @@global.sql_slave_skip_counter=7;
=== modified file 'mysql-test/suite/rpl/r/rpl_row_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_row_crash_safe.result 2010-12-15 17:46:05 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_crash_safe.result 2010-12-22 19:19:17 +0000
@@ -27,7 +27,6 @@ slave_relay_log_info CREATE TABLE `slave
`Number_of_workers` int(10) unsigned NOT NULL,
PRIMARY KEY (`Master_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
-SET SQL_LOG_BIN=0;
CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -40,21 +39,6 @@ CREATE TABLE tt_3 (trans_id INT, stmt_id
CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
-SET SQL_LOG_BIN=0;
-CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_3(trans_id, stmt_id) VALUES(1,1);
=== modified file 'mysql-test/suite/rpl/r/rpl_row_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_row_mixing_engines.result 2010-10-27 14:46:44 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_mixing_engines.result 2010-12-22 19:19:17 +0000
@@ -10,7 +10,6 @@ start slave;
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
SET @verbose= 'Y';
SET @commands= 'configure';
-SET SQL_LOG_BIN=0;
CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -23,21 +22,6 @@ CREATE TABLE tt_3 (trans_id INT, stmt_id
CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
-SET SQL_LOG_BIN=0;
-CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_3(trans_id, stmt_id) VALUES(1,1);
=== modified file 'mysql-test/suite/rpl/r/rpl_row_parallel_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_row_parallel_crash_safe.result 2010-12-22 15:01:47 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_parallel_crash_safe.result 2010-12-22 19:19:17 +0000
@@ -4,8 +4,6 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
call mtr.add_suppression('Attempting backtrace');
call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
@@ -29,7 +27,6 @@ slave_relay_log_info CREATE TABLE `slave
`Number_of_workers` int(10) unsigned NOT NULL,
PRIMARY KEY (`Master_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
-SET SQL_LOG_BIN=0;
CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -42,21 +39,6 @@ CREATE TABLE tt_3 (trans_id INT, stmt_id
CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
-SET SQL_LOG_BIN=0;
-CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_3(trans_id, stmt_id) VALUES(1,1);
@@ -163,11 +145,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -195,11 +173,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -233,11 +207,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -277,11 +247,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -325,11 +291,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-trig C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -379,11 +341,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-func C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -435,11 +393,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-proc C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -483,11 +437,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-trig T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -537,11 +487,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-func T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -593,11 +539,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-proc T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -621,11 +563,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -653,11 +591,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -691,11 +625,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -735,11 +665,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -783,11 +709,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-trig C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -837,11 +759,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-func C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -893,11 +811,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-proc C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -941,11 +855,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-trig T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -995,11 +905,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-func T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1051,11 +957,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-proc T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1079,11 +981,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1111,11 +1009,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1149,11 +1043,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1193,11 +1083,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1241,11 +1127,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-trig C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1295,11 +1177,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-func C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1351,11 +1229,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-proc C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1399,11 +1273,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-trig T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1453,11 +1323,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-func T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1509,11 +1375,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-proc T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
###################################################################################
# EXECUTE CASES CRASHING THE BEGIN/COMMIT
###################################################################################
@@ -1541,11 +1403,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Query # # COMMIT
-e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1573,11 +1431,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Query # # COMMIT
-e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1611,11 +1465,7 @@ master-bin.000001 # Write_rows # # table
master-bin.000001 # Query # # COMMIT
-e-e-e-e-e-e-e-e-e-e-e- >> N-func << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
###################################################################################
# CHECK CONSISTENCY
###################################################################################
=== modified file 'mysql-test/suite/rpl/r/rpl_stm_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_crash_safe.result 2010-12-15 17:46:05 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_crash_safe.result 2010-12-22 19:19:17 +0000
@@ -27,7 +27,6 @@ slave_relay_log_info CREATE TABLE `slave
`Number_of_workers` int(10) unsigned NOT NULL,
PRIMARY KEY (`Master_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
-SET SQL_LOG_BIN=0;
CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -40,21 +39,6 @@ CREATE TABLE tt_3 (trans_id INT, stmt_id
CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
-SET SQL_LOG_BIN=0;
-CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_3(trans_id, stmt_id) VALUES(1,1);
=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result 2010-10-27 14:46:44 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result 2010-12-22 19:19:17 +0000
@@ -10,7 +10,6 @@ start slave;
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
SET @verbose= 'Y';
SET @commands= 'configure';
-SET SQL_LOG_BIN=0;
CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -23,21 +22,6 @@ CREATE TABLE tt_3 (trans_id INT, stmt_id
CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
-SET SQL_LOG_BIN=0;
-CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_3(trans_id, stmt_id) VALUES(1,1);
=== modified file 'mysql-test/suite/rpl/r/rpl_stm_parallel_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_parallel_crash_safe.result 2010-12-22 15:01:47 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_parallel_crash_safe.result 2010-12-22 19:19:17 +0000
@@ -4,8 +4,6 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
call mtr.add_suppression('Attempting backtrace');
call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
@@ -29,7 +27,6 @@ slave_relay_log_info CREATE TABLE `slave
`Number_of_workers` int(10) unsigned NOT NULL,
PRIMARY KEY (`Master_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
-SET SQL_LOG_BIN=0;
CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
@@ -42,21 +39,6 @@ CREATE TABLE tt_3 (trans_id INT, stmt_id
CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
-SET SQL_LOG_BIN=0;
-CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE nt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
-CREATE TABLE tt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_3 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_4 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_5 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-CREATE TABLE tt_6 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = Innodb;
-SET SQL_LOG_BIN=1;
INSERT INTO nt_1(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_2(trans_id, stmt_id) VALUES(1,1);
INSERT INTO nt_3(trans_id, stmt_id) VALUES(1,1);
@@ -161,11 +143,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -187,11 +165,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -215,11 +189,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -247,11 +217,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -287,11 +253,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-trig C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -329,11 +291,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-func C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -371,11 +329,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-proc C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -411,11 +365,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-trig T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -453,11 +403,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-func T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -495,11 +441,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-proc T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -521,11 +463,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -547,11 +485,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -575,11 +509,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -607,11 +537,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -647,11 +573,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-trig C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -689,11 +611,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-func C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -731,11 +649,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-proc C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -771,11 +685,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-trig T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -813,11 +723,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-func T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -855,11 +761,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-proc T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -881,11 +783,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -907,11 +805,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -935,11 +829,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -967,11 +857,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1007,11 +893,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-trig C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1049,11 +931,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-func C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1091,11 +969,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T T-proc C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1131,11 +1005,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-trig T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1173,11 +1043,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-func T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1215,11 +1081,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B T-proc T C << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
###################################################################################
# EXECUTE CASES CRASHING THE BEGIN/COMMIT
###################################################################################
@@ -1245,11 +1107,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Query # # COMMIT
-e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1271,11 +1129,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Query # # COMMIT
-e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
@@ -1299,11 +1153,7 @@ master-bin.000001 # Query # # use `test`
master-bin.000001 # Query # # COMMIT
-e-e-e-e-e-e-e-e-e-e-e- >> N-func << -e-e-e-e-e-e-e-e-e-e-e-
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
START SLAVE;
-Warnings:
-Note 1724 Temporary failed transaction retry is not supported in Parallel Slave. Such failure will force the slave to stop.
###################################################################################
# CHECK CONSISTENCY
###################################################################################
=== modified file 'mysql-test/suite/rpl/t/rpl_migration_crash_safe.test'
--- a/mysql-test/suite/rpl/t/rpl_migration_crash_safe.test 2010-12-22 15:01:47 +0000
+++ b/mysql-test/suite/rpl/t/rpl_migration_crash_safe.test 2010-12-22 19:19:17 +0000
@@ -40,7 +40,7 @@
--source include/not_embedded.inc
--source include/not_valgrind.inc
--source include/not_relay_log_info_table.inc
---source include/not_slave_worker_info_table.inc
+--source include/not_mts_slave_parallel_workers.inc
--connection slave
=== modified file 'mysql-test/suite/rpl/t/rpl_mixed_parallel_crash_safe-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_mixed_parallel_crash_safe-slave.opt 2010-12-22 15:01:47 +0000
+++ b/mysql-test/suite/rpl/t/rpl_mixed_parallel_crash_safe-slave.opt 2010-12-22 19:19:17 +0000
@@ -1,3 +1 @@
---mts-slave-parallel-workers=5 --skip-core-file --skip-slave-start --relay-log-info-repository=TABLE --relay-log-info-engine=innodb --worker-info-repository=TABLE --worker-info-engine=innodb
-
-
+--mts-slave-parallel-workers=5 --skip-core-file --skip-slave-start --relay-log-info-repository=TABLE --relay-log-info-engine=innodb --worker-info-repository=TABLE --worker-info-engine=innodb --slave-transaction-retries=0
=== modified file 'mysql-test/suite/rpl/t/rpl_parallel-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_parallel-slave.opt 2010-12-16 21:41:45 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel-slave.opt 2010-12-22 19:19:17 +0000
@@ -1,2 +1,2 @@
---mts-slave-parallel-workers=4 --log-warnings=0
+--mts-slave-parallel-workers=4 --log-warnings=0 --slave-transaction-retries=0
=== 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 'mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt 2010-11-23 09:03:37 +0000
+++ b/mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt 2010-12-22 19:19:17 +0000
@@ -1 +1 @@
---relay-log-info-repository=FILE
+--relay-log-info-repository=FILE --slave-transaction-retries=0
=== modified file 'mysql-test/suite/rpl/t/rpl_row_parallel_crash_safe-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_parallel_crash_safe-slave.opt 2010-12-22 15:01:47 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_parallel_crash_safe-slave.opt 2010-12-22 19:19:17 +0000
@@ -1,3 +1 @@
---mts-slave-parallel-workers=5 --skip-core-file --skip-slave-start --relay-log-info-repository=TABLE --relay-log-info-engine=innodb --worker-info-repository=TABLE --worker-info-engine=innodb
-
-
+--mts-slave-parallel-workers=5 --skip-core-file --skip-slave-start --relay-log-info-repository=TABLE --relay-log-info-engine=innodb --worker-info-repository=TABLE --worker-info-engine=innodb --slave-transaction-retries=0
=== modified file 'mysql-test/suite/rpl/t/rpl_sequential.test'
--- a/mysql-test/suite/rpl/t/rpl_sequential.test 2010-12-14 08:57:16 +0000
+++ b/mysql-test/suite/rpl/t/rpl_sequential.test 2010-12-22 19:19:17 +0000
@@ -5,7 +5,8 @@
# counterpart rpl_parallel.test. Read more comments in there.
#
-source include/master-slave.inc;
+--source include/master-slave.inc
+--source include/not_mts_slave_parallel_workers.inc
connection slave;
=== modified file 'mysql-test/suite/rpl/t/rpl_server_id2.test'
--- a/mysql-test/suite/rpl/t/rpl_server_id2.test 2009-11-27 23:34:47 +0000
+++ b/mysql-test/suite/rpl/t/rpl_server_id2.test 2010-12-22 19:19:17 +0000
@@ -46,7 +46,9 @@ connection slave;
--replace_result $MASTER_MYPORT MASTER_PORT
eval change master to master_port=$MASTER_MYPORT;
--replace_result $until_pos UNTIL_POS
+--disable_warnings
eval start slave until master_log_file='master-bin.000001', master_log_pos=$until_pos;
+--enable_warnings
--source include/wait_for_slave_io_to_start.inc
--source include/wait_for_slave_sql_to_stop.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_stm_parallel_crash_safe-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_stm_parallel_crash_safe-slave.opt 2010-12-22 15:01:47 +0000
+++ b/mysql-test/suite/rpl/t/rpl_stm_parallel_crash_safe-slave.opt 2010-12-22 19:19:17 +0000
@@ -1,3 +1 @@
---mts-slave-parallel-workers=5 --skip-core-file --skip-slave-start --relay-log-info-repository=TABLE --relay-log-info-engine=innodb --worker-info-repository=TABLE --worker-info-engine=innodb
-
-
+--mts-slave-parallel-workers=5 --skip-core-file --skip-slave-start --relay-log-info-repository=TABLE --relay-log-info-engine=innodb --worker-info-repository=TABLE --worker-info-engine=innodb --slave-transaction-retries=0
=== modified file 'mysql-test/suite/rpl/t/rpl_temporary_errors.test'
--- a/mysql-test/suite/rpl/t/rpl_temporary_errors.test 2010-08-12 00:26:10 +0000
+++ b/mysql-test/suite/rpl/t/rpl_temporary_errors.test 2010-12-22 19:19:17 +0000
@@ -1,6 +1,7 @@
-source include/have_debug.inc;
-source include/have_binlog_format_row.inc;
-source include/master-slave.inc;
+--source include/have_debug.inc
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+--source include/not_mts_slave_parallel_workers.inc
call mtr.add_suppression("Deadlock found");
=== 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-23 11:25:31 +0000
+++ b/sql/rpl_slave.cc 2010-12-23 11:27:15 +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);
}
Attachment: [text/bzr-bundle] bzr/andrei.elkin@oracle.com-20101223112715-nyke1ibzar33gr98.bundle
| Thread |
|---|
| • bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3261) WL#5569 | Andrei Elkin | 23 Dec |
