From 379819d8c06ee086e9a3f5cf7e6c225fdb626596 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 14 Mar 2013 10:39:16 +0100 Subject: [PATCH] MDEV-26: Global transaction ID. After-rebase fixes. Rebase was done to be able to build on top of the binlog background thread of MDEV-532. --- mysql-test/suite/multi_source/gtid.result | 14 +++++++------- .../suite/rpl/r/rpl_gtid_errorhandling.result | 8 ++++---- mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test | 8 ++++---- sql/sql_repl.cc | 3 ++- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/mysql-test/suite/multi_source/gtid.result b/mysql-test/suite/multi_source/gtid.result index 5cec6699a72..28df2aa1fa9 100644 --- a/mysql-test/suite/multi_source/gtid.result +++ b/mysql-test/suite/multi_source/gtid.result @@ -2,8 +2,8 @@ CHANGE MASTER 'slave1' TO master_port=MYPORT_1, master_host='127.0.0.1', master_ CHANGE MASTER 'slave2' TO master_port=MYPORT_2, master_host='127.0.0.1', master_user='root'; start all slaves; Warnings: -Note 1936 SLAVE 'slave2' started -Note 1936 SLAVE 'slave1' started +Note 1937 SLAVE 'slave2' started +Note 1937 SLAVE 'slave1' started set default_master_connection = 'slave1'; include/wait_for_slave_to_start.inc set default_master_connection = 'slave2'; @@ -12,7 +12,7 @@ set default_master_connection = ''; CHANGE MASTER TO master_port=MYPORT_3, master_host='127.0.0.1', master_user='root'; start all slaves; Warnings: -Note 1936 SLAVE '' started +Note 1937 SLAVE '' started include/wait_for_slave_to_start.inc SET GLOBAL gtid_domain_id= 1; SET SESSION gtid_domain_id= 1; @@ -81,7 +81,7 @@ Gtid_Pos 1-1-4,2-2-3 *** Now move slave2 to replicate from both master1 and master2 instead of just slave1 *** STOP ALL SLAVES; Warnings: -Note 1937 SLAVE '' stopped +Note 1938 SLAVE '' stopped INSERT INTO t1 VALUES (2, "switch1"); INSERT INTO t3 VALUES (102, "switch1 a"); INSERT INTO t2 VALUES (2, "switch1"); @@ -135,13 +135,13 @@ DROP TABLE t3; SET GLOBAL gtid_domain_id=0; STOP ALL SLAVES; Warnings: -Note 1937 SLAVE '' stopped +Note 1938 SLAVE '' stopped include/reset_master_slave.inc SET GLOBAL gtid_domain_id=0; STOP ALL SLAVES; Warnings: -Note 1937 SLAVE 'slave2' stopped -Note 1937 SLAVE 'slave1' stopped +Note 1938 SLAVE 'slave2' stopped +Note 1938 SLAVE 'slave1' stopped include/reset_master_slave.inc SET GLOBAL gtid_domain_id=0; include/reset_master_slave.inc diff --git a/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result b/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result index ccacdc68b50..71af8a165a6 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result @@ -7,21 +7,21 @@ ALTER TABLE mysql.rpl_slave_state CHANGE seq_no seq_no VARCHAR(20); START SLAVE; INSERT INTO t1 VALUES (1); CALL mtr.add_suppression("Slave: Failed to open mysql.rpl_slave_state"); -include/wait_for_slave_sql_error.inc [errno=1942] +include/wait_for_slave_sql_error.inc [errno=1943] include/stop_slave.inc ALTER TABLE mysql.rpl_slave_state CHANGE seq_no seq_no BIGINT UNSIGNED NOT NULL; ALTER TABLE mysql.rpl_slave_state DROP PRIMARY KEY; ALTER TABLE mysql.rpl_slave_state ADD PRIMARY KEY (sub_id, domain_id); START SLAVE; -include/wait_for_slave_sql_error.inc [errno=1942] +include/wait_for_slave_sql_error.inc [errno=1943] include/stop_slave.inc ALTER TABLE mysql.rpl_slave_state DROP PRIMARY KEY; START SLAVE; -include/wait_for_slave_sql_error.inc [errno=1942] +include/wait_for_slave_sql_error.inc [errno=1943] include/stop_slave.inc ALTER TABLE mysql.rpl_slave_state ADD PRIMARY KEY (sub_id); START SLAVE; -include/wait_for_slave_sql_error.inc [errno=1942] +include/wait_for_slave_sql_error.inc [errno=1943] include/stop_slave.inc ALTER TABLE mysql.rpl_slave_state DROP PRIMARY KEY; ALTER TABLE mysql.rpl_slave_state ADD PRIMARY KEY (domain_id, sub_id); diff --git a/mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test b/mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test index cdeb8c732dc..2001dccb7d3 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test @@ -16,7 +16,7 @@ INSERT INTO t1 VALUES (1); --connection slave CALL mtr.add_suppression("Slave: Failed to open mysql.rpl_slave_state"); ---let $slave_sql_errno=1942 +--let $slave_sql_errno=1943 --source include/wait_for_slave_sql_error.inc --source include/stop_slave.inc @@ -24,19 +24,19 @@ ALTER TABLE mysql.rpl_slave_state CHANGE seq_no seq_no BIGINT UNSIGNED NOT NULL; ALTER TABLE mysql.rpl_slave_state DROP PRIMARY KEY; ALTER TABLE mysql.rpl_slave_state ADD PRIMARY KEY (sub_id, domain_id); START SLAVE; ---let $slave_sql_errno=1942 +--let $slave_sql_errno=1943 --source include/wait_for_slave_sql_error.inc --source include/stop_slave.inc ALTER TABLE mysql.rpl_slave_state DROP PRIMARY KEY; START SLAVE; ---let $slave_sql_errno=1942 +--let $slave_sql_errno=1943 --source include/wait_for_slave_sql_error.inc --source include/stop_slave.inc ALTER TABLE mysql.rpl_slave_state ADD PRIMARY KEY (sub_id); START SLAVE; ---let $slave_sql_errno=1942 +--let $slave_sql_errno=1943 --source include/wait_for_slave_sql_error.inc --source include/stop_slave.inc diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 5eeddd66966..fb2c75e0902 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -742,7 +742,8 @@ gtid_find_binlog_file(slave_connection_state *state, char *out_name) char buf[FN_REFLEN]; bzero((char*) &cache, sizeof(cache)); - init_alloc_root(&memroot, 10*(FN_REFLEN+sizeof(binlog_file_entry)), 0); + init_alloc_root(&memroot, 10*(FN_REFLEN+sizeof(binlog_file_entry)), 0, + MYF(MY_THREAD_SPECIFIC)); if (!(list= get_binlog_list(&memroot))) { errormsg= "Out of memory while looking for GTID position in binlog";