database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-28839: remove current_pos where not intentionally being tested

Browse Source 
Task:
=====
Update tests to reflect MDEV-20122, deprecation of master_use_gtid=current_pos.
Change Master (CM) statements were either removed or modified with
current_pos --> slave_pos based on original intention of the test.
Reviewed by:
============
Brandon Nesterenko <brandon.nesterenko@mariadb.com>
This commit is contained in:
asklavou
2022-10-28 11:14:44 +01:00
committed by Angelique
parent 25a8bdda08
commit 7aace5d5da
38 changed files with 50 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/suite/multi_source/gtid.result
View File

@ -47,12 +47,8 @@ connection master2;
INSERT INTO t2 VALUES (2, "switch1"); INSERT INTO t2 VALUES (2, "switch1");
INSERT INTO t3 VALUES (202, "switch1 b"); INSERT INTO t3 VALUES (202, "switch1 b");
connection slave2; connection slave2;
CHANGE MASTER 'slave1' TO master_port=MYPORT_1, master_host='127.0.0.1', master_user='root', master_use_gtid=current_pos; CHANGE MASTER 'slave1' TO master_port=MYPORT_1, master_host='127.0.0.1', master_user='root';
Warnings: CHANGE MASTER 'slave2' TO master_port=MYPORT_2, master_host='127.0.0.1', master_user='root';
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
CHANGE MASTER 'slave2' TO master_port=MYPORT_2, master_host='127.0.0.1', master_user='root', master_use_gtid=current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
SET default_master_connection = 'slave1'; SET default_master_connection = 'slave1';
START SLAVE; START SLAVE;
include/wait_for_slave_to_start.inc include/wait_for_slave_to_start.inc
@ -79,9 +75,7 @@ INSERT INTO t3 VALUES (204, "switch 3 b");
connection slave2; connection slave2;
include/sync_with_master_gtid.inc include/sync_with_master_gtid.inc
connection slave1; connection slave1;
CHANGE MASTER TO master_port=MYPORT_4, master_host='127.0.0.1', master_user='root', master_use_gtid=current_pos; CHANGE MASTER TO master_port=MYPORT_4, master_host='127.0.0.1', master_user='root';
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
START SLAVE; START SLAVE;
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
a b a b

6
mysql-test/suite/multi_source/gtid.test
View File

@ -73,9 +73,9 @@ INSERT INTO t3 VALUES (202, "switch1 b");
--connection slave2 --connection slave2
--replace_result $SERVER_MYPORT_1 MYPORT_1 --replace_result $SERVER_MYPORT_1 MYPORT_1
eval CHANGE MASTER 'slave1' TO master_port=$SERVER_MYPORT_1, master_host='127.0.0.1', master_user='root', master_use_gtid=current_pos; eval CHANGE MASTER 'slave1' TO master_port=$SERVER_MYPORT_1, master_host='127.0.0.1', master_user='root';
--replace_result $SERVER_MYPORT_2 MYPORT_2 --replace_result $SERVER_MYPORT_2 MYPORT_2
eval CHANGE MASTER 'slave2' TO master_port=$SERVER_MYPORT_2, master_host='127.0.0.1', master_user='root', master_use_gtid=current_pos; eval CHANGE MASTER 'slave2' TO master_port=$SERVER_MYPORT_2, master_host='127.0.0.1', master_user='root';
SET default_master_connection = 'slave1'; SET default_master_connection = 'slave1';
START SLAVE; START SLAVE;
--source include/wait_for_slave_to_start.inc --source include/wait_for_slave_to_start.inc
@ -125,7 +125,7 @@ INSERT INTO t3 VALUES (204, "switch 3 b");
--connection slave1 --connection slave1
--replace_result $SERVER_MYPORT_4 MYPORT_4 --replace_result $SERVER_MYPORT_4 MYPORT_4
eval CHANGE MASTER TO master_port=$SERVER_MYPORT_4, master_host='127.0.0.1', master_user='root', master_use_gtid=current_pos; eval CHANGE MASTER TO master_port=$SERVER_MYPORT_4, master_host='127.0.0.1', master_user='root';
START SLAVE; START SLAVE;
--let $wait_condition= SELECT (SELECT COUNT(*) FROM t1)=3 AND (SELECT COUNT(*) FROM t2)=4 AND (SELECT COUNT(*) FROM t3)=7 --let $wait_condition= SELECT (SELECT COUNT(*) FROM t1)=3 AND (SELECT COUNT(*) FROM t2)=4 AND (SELECT COUNT(*) FROM t3)=7
--source include/wait_condition.inc --source include/wait_condition.inc

4
mysql-test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result
View File

@ -4,9 +4,7 @@ connection master;
SET GLOBAL LOG_WARNINGS=2; SET GLOBAL LOG_WARNINGS=2;
connection slave; connection slave;
include/stop_slave.inc include/stop_slave.inc
CHANGE MASTER TO MASTER_USE_GTID=current_pos; CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
connection master; connection master;
"Test Case 1: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('')" "Test Case 1: Start binlog_dump to slave_server(#), pos(master-bin.000001, ###), using_gtid(1), gtid('')"

4
mysql-test/suite/rpl/r/rpl_gtid_crash.result
View File

@ -14,9 +14,7 @@ call mtr.add_suppression('Master command COM_REGISTER_SLAVE failed: failed regis
SET sql_log_bin=1; SET sql_log_bin=1;
include/stop_slave.inc include/stop_slave.inc
CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
connection server_1; connection server_1;
INSERT INTO t1 VALUES (2,1); INSERT INTO t1 VALUES (2,1);
INSERT INTO t1 VALUES (3,1); INSERT INTO t1 VALUES (3,1);

6
mysql-test/suite/rpl/r/rpl_gtid_excess_initial_delay.result
View File

@ -3,9 +3,7 @@ include/master-slave.inc
CREATE TABLE t1 (i INT); CREATE TABLE t1 (i INT);
connection slave; connection slave;
include/stop_slave.inc include/stop_slave.inc
CHANGE MASTER TO MASTER_USE_GTID= current_pos, MASTER_DELAY= 10; CHANGE MASTER TO MASTER_DELAY= 10;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
connection master; connection master;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
@ -16,7 +14,7 @@ connection slave;
# Asserted this: One row shoule be found in table t1. # Asserted this: One row shoule be found in table t1.
"======= Clean up ========" "======= Clean up ========"
STOP SLAVE; STOP SLAVE;
CHANGE MASTER TO MASTER_USE_GTID=no, MASTER_DELAY=0; CHANGE MASTER TO MASTER_DELAY=0;
START SLAVE; START SLAVE;
connection master; connection master;
DROP TABLE t1; DROP TABLE t1;

18
mysql-test/suite/rpl/r/rpl_gtid_master_promote.result
View File

@ -12,24 +12,12 @@ RETURN s;
END| END|
connection server_2; connection server_2;
include/stop_slave.inc include/stop_slave.inc
CHANGE MASTER TO master_use_gtid=current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
connection server_3; connection server_3;
include/stop_slave.inc include/stop_slave.inc
CHANGE MASTER TO master_use_gtid=current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
connection server_4; connection server_4;
include/stop_slave.inc include/stop_slave.inc
CHANGE MASTER TO master_use_gtid=current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
connection server_5; connection server_5;
include/stop_slave.inc include/stop_slave.inc
CHANGE MASTER TO master_use_gtid=current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
connection server_1; connection server_1;
SET gtid_domain_id= 1; SET gtid_domain_id= 1;
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
@ -347,9 +335,7 @@ a b
*** Now let the old master join up as slave. *** *** Now let the old master join up as slave. ***
connection server_1; connection server_1;
CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_2, CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_2,
master_user = "root", master_use_gtid = current_pos; master_user = "root", master_use_gtid = slave_pos, master_demote_to_slave=1;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
a a
@ -387,8 +373,6 @@ a b
connection server_1; connection server_1;
include/stop_slave.inc include/stop_slave.inc
RESET SLAVE ALL; RESET SLAVE ALL;
Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos'
connection server_2; connection server_2;
CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1; CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1;
include/start_slave.inc include/start_slave.inc

18
mysql-test/suite/rpl/r/rpl_gtid_mdev4473.result
View File

@ -12,9 +12,7 @@ include/wait_for_slave_to_stop.inc
reset slave all; reset slave all;
connection server_1; connection server_1;
CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_2, CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_2,
master_user='root', MASTER_USE_GTID=CURRENT_POS; master_user='root', MASTER_USE_GTID=SLAVE_POS, master_demote_to_slave=1;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
include/wait_for_slave_to_start.inc include/wait_for_slave_to_start.inc
connection server_2; connection server_2;
@ -24,9 +22,7 @@ insert into t1 values (4);
flush logs; flush logs;
connection server_3; connection server_3;
CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_2, CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_2,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
select * from t1 order by n; select * from t1 order by n;
n n
@ -57,20 +53,14 @@ connection server_1;
include/stop_slave.inc include/stop_slave.inc
include/wait_for_slave_to_stop.inc include/wait_for_slave_to_stop.inc
reset slave all; reset slave all;
Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos'
connection server_2; connection server_2;
CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1, CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1,
master_user = 'root', MASTER_USE_GTID=CURRENT_POS; master_user = 'root', MASTER_USE_GTID=SLAVE_POS, master_demote_to_slave=1;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
connection server_3; connection server_3;
include/stop_slave.inc include/stop_slave.inc
CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1, CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
connection server_1; connection server_1;
drop table t1; drop table t1;

3
mysql-test/suite/rpl/r/rpl_gtid_misc.result
View File

@ -9,9 +9,6 @@ include/stop_slave.inc
SET sql_log_bin= 0; SET sql_log_bin= 0;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
SET sql_log_bin= 1; SET sql_log_bin= 1;
CHANGE MASTER TO master_use_gtid= current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
connection master; connection master;
CREATE TEMPORARY TABLE t2 LIKE t1; CREATE TEMPORARY TABLE t2 LIKE t1;
INSERT INTO t2 VALUE (1); INSERT INTO t2 VALUE (1);

11
mysql-test/suite/rpl/r/rpl_gtid_nobinlog.result
View File

@ -21,9 +21,7 @@ a b
include/stop_slave.inc include/stop_slave.inc
connection server_1; connection server_1;
CHANGE MASTER TO master_host = '127.0.0.1', master_port = SLAVE_PORT, CHANGE MASTER TO master_host = '127.0.0.1', master_port = SLAVE_PORT,
master_user = 'root', master_use_gtid = current_pos; master_user = 'root';
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
START SLAVE; START SLAVE;
include/wait_for_slave_to_start.inc include/wait_for_slave_to_start.inc
connection server_2; connection server_2;
@ -48,16 +46,11 @@ a b
4 2 4 2
include/stop_slave.inc include/stop_slave.inc
RESET SLAVE; RESET SLAVE;
Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos'
INSERT INTO t1 VALUES (5, 1); INSERT INTO t1 VALUES (5, 1);
INSERT INTO t1 VALUES (6, 1); INSERT INTO t1 VALUES (6, 1);
include/save_master_gtid.inc include/save_master_gtid.inc
connection server_2; connection server_2;
CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT;
master_use_gtid = current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
START SLAVE; START SLAVE;
include/sync_with_master_gtid.inc include/sync_with_master_gtid.inc
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;

6
mysql-test/suite/rpl/r/rpl_gtid_reconnect.result
View File

@ -1,10 +1,4 @@
include/rpl_init.inc [topology=1->2] include/rpl_init.inc [topology=1->2]
connection server_2;
include/stop_slave.inc
CHANGE MASTER TO master_use_gtid= current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc
connection server_1; connection server_1;
CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT);
FLUSH LOGS; FLUSH LOGS;

4
mysql-test/suite/rpl/r/rpl_gtid_sort.result
View File

@ -58,9 +58,7 @@ SHOW VARIABLES LIKE 'gtid_binlog_state';
Variable_name Value Variable_name Value
gtid_binlog_state gtid_binlog_state
CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
SHOW VARIABLES LIKE 'gtid_binlog_pos'; SHOW VARIABLES LIKE 'gtid_binlog_pos';
Variable_name Value Variable_name Value

30
mysql-test/suite/rpl/r/rpl_gtid_startpos.result
View File

@ -11,9 +11,7 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
connection server_2; connection server_2;
SET GLOBAL gtid_slave_pos=""; SET GLOBAL gtid_slave_pos="";
CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
SELECT * FROM t1; SELECT * FROM t1;
a a
@ -35,9 +33,7 @@ master-bin.000003 #
connection server_2; connection server_2;
SET GLOBAL gtid_slave_pos=""; SET GLOBAL gtid_slave_pos="";
CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
START SLAVE; START SLAVE;
include/wait_for_slave_io_error.inc [errno=1236] include/wait_for_slave_io_error.inc [errno=1236]
include/stop_slave.inc include/stop_slave.inc
@ -59,9 +55,7 @@ include/save_master_gtid.inc
connection server_2; connection server_2;
SET GLOBAL gtid_slave_pos='0-1-3'; SET GLOBAL gtid_slave_pos='0-1-3';
CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT, CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
include/sync_with_master_gtid.inc include/sync_with_master_gtid.inc
SELECT * FROM t1 ORDER by a; SELECT * FROM t1 ORDER by a;
@ -96,16 +90,12 @@ connection server_2;
connection server_2; connection server_2;
include/stop_slave.inc include/stop_slave.inc
RESET SLAVE ALL; RESET SLAVE ALL;
Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos'
RESET MASTER; RESET MASTER;
connection server_1; connection server_1;
RESET MASTER; RESET MASTER;
connection server_2; connection server_2;
SET GLOBAL gtid_slave_pos=''; SET GLOBAL gtid_slave_pos='';
CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=current_pos; CHANGE MASTER TO master_host='127.0.0.1', master_port=MASTER_PORT, master_user='root', master_use_gtid=slave_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
connection server_1; connection server_1;
CREATE TABLE t1 (a INT PRIMARY KEY); CREATE TABLE t1 (a INT PRIMARY KEY);
@ -129,8 +119,6 @@ connection server_2;
include/stop_slave.inc include/stop_slave.inc
DROP TABLE t1; DROP TABLE t1;
RESET SLAVE; RESET SLAVE;
Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos'
SET GLOBAL gtid_slave_pos=""; SET GLOBAL gtid_slave_pos="";
Warnings: Warnings:
Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-4. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos Warning 1948 Specified value for @@gtid_slave_pos contains no value for replication domain 0. This conflicts with the binary log which contains GTID 0-2-4. If MASTER_GTID_POS=CURRENT_POS is used, the binlog position will override the new value of @@gtid_slave_pos
@ -162,9 +150,7 @@ Using_Gtid = 'No'
START SLAVE; START SLAVE;
include/wait_for_slave_sql_error.inc [errno=1050] include/wait_for_slave_sql_error.inc [errno=1050]
STOP SLAVE IO_THREAD; STOP SLAVE IO_THREAD;
CHANGE MASTER TO MASTER_USE_GTID=CURRENT_POS; CHANGE MASTER TO MASTER_USE_GTID=SLAVE_POS;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
connection server_1; connection server_1;
INSERT INTO t1 VALUES(3); INSERT INTO t1 VALUES(3);
@ -223,9 +209,9 @@ include/sync_with_master_gtid.inc
SELECT * FROM t1; SELECT * FROM t1;
a a
10 10
SELECT 'Current_Pos' AS Using_Gtid; SELECT 'Slave_Pos' AS Using_Gtid;
Using_Gtid Using_Gtid
Current_Pos Slave_Pos
SELECT '0-1-2' AS Gtid_Slave_Pos; SELECT '0-1-2' AS Gtid_Slave_Pos;
Gtid_Slave_Pos Gtid_Slave_Pos
0-1-2 0-1-2
@ -252,8 +238,6 @@ connection server_2;
include/stop_slave.inc include/stop_slave.inc
DROP TABLE t1; DROP TABLE t1;
RESET SLAVE ALL; RESET SLAVE ALL;
Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos'
CHANGE MASTER TO MASTER_USE_GTID=NO; CHANGE MASTER TO MASTER_USE_GTID=NO;
RESET MASTER; RESET MASTER;
SET GLOBAL gtid_slave_pos= ""; SET GLOBAL gtid_slave_pos= "";

3
mysql-test/suite/rpl/r/rpl_gtid_stop_start.result
View File

@ -7,9 +7,6 @@ connection server_2;
include/stop_slave.inc include/stop_slave.inc
Master_Log_File = 'master-bin.000001' Master_Log_File = 'master-bin.000001'
Using_Gtid = 'Slave_Pos' Using_Gtid = 'Slave_Pos'
CHANGE MASTER TO master_use_gtid=current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
FLUSH LOGS; FLUSH LOGS;
connection server_1; connection server_1;
FLUSH LOGS; FLUSH LOGS;

12
mysql-test/suite/rpl/r/rpl_gtid_until.result
View File

@ -29,9 +29,7 @@ ERROR HY000: Slave is already running
include/stop_slave_io.inc include/stop_slave_io.inc
START SLAVE UNTIL master_gtid_pos = ""; START SLAVE UNTIL master_gtid_pos = "";
ERROR HY000: START SLAVE UNTIL master_gtid_pos requires that slave is using GTID ERROR HY000: START SLAVE UNTIL master_gtid_pos requires that slave is using GTID
CHANGE MASTER TO master_use_gtid=current_pos; CHANGE MASTER TO master_use_gtid=slave_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
connection server_1; connection server_1;
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(1);
@ -60,7 +58,7 @@ a
include/stop_slave.inc include/stop_slave.inc
START SLAVE UNTIL master_gtid_pos = "1-10-100,2-20-200,0-1-300"; START SLAVE UNTIL master_gtid_pos = "1-10-100,2-20-200,0-1-300";
include/wait_for_slave_to_start.inc include/wait_for_slave_to_start.inc
Using_Gtid = 'Current_Pos' Using_Gtid = 'Slave_Pos'
Until_Condition = 'Gtid' Until_Condition = 'Gtid'
connection server_1; connection server_1;
INSERT INTO t1 VALUES (3); INSERT INTO t1 VALUES (3);
@ -205,8 +203,6 @@ include/start_slave.inc
connection server_2; connection server_2;
include/stop_slave.inc include/stop_slave.inc
RESET SLAVE ALL; RESET SLAVE ALL;
Warnings:
Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'Current_Pos' to 'Slave_Pos'
RESET MASTER; RESET MASTER;
SET GLOBAL gtid_slave_pos=''; SET GLOBAL gtid_slave_pos='';
connection server_1; connection server_1;
@ -219,9 +215,7 @@ RESET MASTER;
INSERT INTO t1 VALUES (10); INSERT INTO t1 VALUES (10);
connection server_2; connection server_2;
CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1, CHANGE MASTER TO master_host = '127.0.0.1', master_port = SERVER_MYPORT_1,
master_user = "root", master_use_gtid = current_pos; master_user = "root", master_use_gtid = slave_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
START SLAVE UNTIL master_gtid_pos = '0-1-2'; START SLAVE UNTIL master_gtid_pos = '0-1-2';
include/wait_for_slave_to_start.inc include/wait_for_slave_to_start.inc
connection server_1; connection server_1;

3
mysql-test/suite/rpl/r/rpl_mdev6386.result
View File

@ -10,9 +10,6 @@ SET sql_log_bin= 0;
CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends"); CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends");
INSERT INTO t1 VALUES (1, 2); INSERT INTO t1 VALUES (1, 2);
SET sql_log_bin= 1; SET sql_log_bin= 1;
CHANGE MASTER TO master_use_gtid= current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
Contents on slave before: Contents on slave before:
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
a b a b

3
mysql-test/suite/rpl/r/rpl_parallel_mdev6589.result
View File

@ -4,9 +4,6 @@ connection server_2;
SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
include/stop_slave.inc include/stop_slave.inc
SET GLOBAL slave_parallel_threads=10; SET GLOBAL slave_parallel_threads=10;
CHANGE MASTER TO master_use_gtid=current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
*** MDEV-6589: Incorrect relay log start position when restarting SQL thread after error in parallel replication *** *** MDEV-6589: Incorrect relay log start position when restarting SQL thread after error in parallel replication ***
connection server_1; connection server_1;

6
mysql-test/suite/rpl/r/rpl_parallel_multilevel2.result
View File

@ -17,16 +17,10 @@ SET GLOBAL binlog_commit_wait_usec=2000000;
SET @old_updates= @@GLOBAL.binlog_direct_non_transactional_updates; SET @old_updates= @@GLOBAL.binlog_direct_non_transactional_updates;
SET GLOBAL binlog_direct_non_transactional_updates=OFF; SET GLOBAL binlog_direct_non_transactional_updates=OFF;
SET SESSION binlog_direct_non_transactional_updates=OFF; SET SESSION binlog_direct_non_transactional_updates=OFF;
CHANGE MASTER TO master_use_gtid=current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
connection server_3; connection server_3;
SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
include/stop_slave.inc include/stop_slave.inc
SET GLOBAL slave_parallel_threads=10; SET GLOBAL slave_parallel_threads=10;
CHANGE MASTER TO master_use_gtid=current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
connection server_1; connection server_1;
BEGIN; BEGIN;
CREATE TEMPORARY TABLE t2 (a INT PRIMARY KEY) ENGINE=MEMORY; CREATE TEMPORARY TABLE t2 (a INT PRIMARY KEY) ENGINE=MEMORY;

3
mysql-test/suite/rpl/r/rpl_parallel_temptable.result
View File

@ -4,9 +4,6 @@ connection server_2;
SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
include/stop_slave.inc include/stop_slave.inc
SET GLOBAL slave_parallel_threads=5; SET GLOBAL slave_parallel_threads=5;
CHANGE MASTER TO master_use_gtid= current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/start_slave.inc include/start_slave.inc
connection server_1; connection server_1;
CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(100) CHARACTER SET utf8); CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(100) CHARACTER SET utf8);

3
mysql-test/suite/rpl/r/rpl_start_alter_mysqlbinlog_1.result
View File

@ -4,9 +4,6 @@ connection master;
set global binlog_alter_two_phase=true; set global binlog_alter_two_phase=true;
connection slave; connection slave;
include/stop_slave.inc include/stop_slave.inc
change master to master_use_gtid= current_pos;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
set global gtid_strict_mode=1; set global gtid_strict_mode=1;
# Legacy Master Slave # Legacy Master Slave
connect master_node,127.0.0.1,root,,$db_name, $M_port; connect master_node,127.0.0.1,root,,$db_name, $M_port;

3
mysql-test/suite/rpl/r/rpl_upgrade_master_info.result
View File

@ -3,9 +3,6 @@ include/master-slave.inc
*** MDEV-9383: Server fails to read master.info after upgrade 10.0 -> 10.1 *** *** MDEV-9383: Server fails to read master.info after upgrade 10.0 -> 10.1 ***
connection slave; connection slave;
include/stop_slave.inc include/stop_slave.inc
CHANGE MASTER TO master_use_gtid=CURRENT_POS;
Warnings:
Warning 1681 'master_use_gtid=current_pos' is deprecated and will be removed in a future release. Please use master_demote_to_slave=1 instead
include/rpl_stop_server.inc [server_number=2] include/rpl_stop_server.inc [server_number=2]
include/rpl_start_server.inc [server_number=2] include/rpl_start_server.inc [server_number=2]
connection master; connection master;

4
mysql-test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test
View File

@ -8,7 +8,7 @@
# Steps: # Steps:
# 0 - Have LOG_WARNINGS=2 # 0 - Have LOG_WARNINGS=2
# 1 - On a fresh slave server which has not replicated any GTIDs execute # 1 - On a fresh slave server which has not replicated any GTIDs execute
# "CHANGE MASTER TO MASTER_USE_GTID=current_pos;" command. Start the # "CHANGE MASTER TO MASTER_USE_GTID=slave_pos;" command. Start the
# slave. # slave.
# 2 - In Master error log verify that pattern "using_gtid(1), gtid('')" is # 2 - In Master error log verify that pattern "using_gtid(1), gtid('')" is
# present. # present.
@ -43,7 +43,7 @@ SET GLOBAL LOG_WARNINGS=2;
--connection slave --connection slave
--source include/stop_slave.inc --source include/stop_slave.inc
CHANGE MASTER TO MASTER_USE_GTID=current_pos; CHANGE MASTER TO MASTER_USE_GTID=slave_pos;
--source include/start_slave.inc --source include/start_slave.inc
--connection master --connection master

2
mysql-test/suite/rpl/t/rpl_gtid_crash.test
View File

@ -27,7 +27,7 @@ SET sql_log_bin=1;
--source include/stop_slave.inc --source include/stop_slave.inc
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
--connection server_1 --connection server_1
INSERT INTO t1 VALUES (2,1); INSERT INTO t1 VALUES (2,1);

6
mysql-test/suite/rpl/t/rpl_gtid_excess_initial_delay.test
View File

@ -7,7 +7,7 @@
# #
# Steps: # Steps:
# 0 - Stop the slave and execute CHANGE MASTER command with # 0 - Stop the slave and execute CHANGE MASTER command with
# master_use_gtid= curren_pos and master_delay= 10 # master_delay= 10
# 1 - On slave introduce a sleep of 15 seconds and check that the # 1 - On slave introduce a sleep of 15 seconds and check that the
# Seconds_Behind_Master is within specified master_delay limit. It should # Seconds_Behind_Master is within specified master_delay limit. It should
# not be more that "10" seconds. # not be more that "10" seconds.
@ -23,7 +23,7 @@ CREATE TABLE t1 (i INT);
--sync_slave_with_master --sync_slave_with_master
--source include/stop_slave.inc --source include/stop_slave.inc
CHANGE MASTER TO MASTER_USE_GTID= current_pos, MASTER_DELAY= 10; CHANGE MASTER TO MASTER_DELAY= 10;
--source include/start_slave.inc --source include/start_slave.inc
--connection master --connection master
@ -47,7 +47,7 @@ INSERT INTO t1 VALUES (1);
--echo "======= Clean up ========" --echo "======= Clean up ========"
STOP SLAVE; STOP SLAVE;
CHANGE MASTER TO MASTER_USE_GTID=no, MASTER_DELAY=0; CHANGE MASTER TO MASTER_DELAY=0;
START SLAVE; START SLAVE;
--connection master --connection master

6
mysql-test/suite/rpl/t/rpl_gtid_master_promote.test
View File

@ -31,22 +31,18 @@ delimiter ;|
--connection server_2 --connection server_2
--sync_with_master --sync_with_master
--source include/stop_slave.inc --source include/stop_slave.inc
CHANGE MASTER TO master_use_gtid=current_pos;
--connection server_3 --connection server_3
--sync_with_master --sync_with_master
--source include/stop_slave.inc --source include/stop_slave.inc
CHANGE MASTER TO master_use_gtid=current_pos;
--connection server_4 --connection server_4
--sync_with_master --sync_with_master
--source include/stop_slave.inc --source include/stop_slave.inc
CHANGE MASTER TO master_use_gtid=current_pos;
--connection server_5 --connection server_5
--sync_with_master --sync_with_master
--source include/stop_slave.inc --source include/stop_slave.inc
CHANGE MASTER TO master_use_gtid=current_pos;
# Create three separate replication streams on master server_1. # Create three separate replication streams on master server_1.
@ -225,7 +221,7 @@ SELECT * FROM t4 ORDER BY a,b;
--connection server_1 --connection server_1
--replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2 --replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_2, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_2,
master_user = "root", master_use_gtid = current_pos; master_user = "root", master_use_gtid = slave_pos, master_demote_to_slave=1;
--source include/start_slave.inc --source include/start_slave.inc
--sync_with_master --sync_with_master
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;

8
mysql-test/suite/rpl/t/rpl_gtid_mdev4473.test
View File

@ -24,7 +24,7 @@ reset slave all;
connection server_1; connection server_1;
--replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2 --replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_2, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_2,
master_user='root', MASTER_USE_GTID=CURRENT_POS; master_user='root', MASTER_USE_GTID=SLAVE_POS, master_demote_to_slave=1;
source include/start_slave.inc; source include/start_slave.inc;
source include/wait_for_slave_to_start.inc; source include/wait_for_slave_to_start.inc;
@ -38,7 +38,7 @@ save_master_pos;
connection server_3; connection server_3;
--replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2 --replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_2, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_2,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
source include/start_slave.inc; source include/start_slave.inc;
sync_with_master; sync_with_master;
@ -56,14 +56,14 @@ reset slave all;
connection server_2; connection server_2;
--replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 --replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_1, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_1,
master_user = 'root', MASTER_USE_GTID=CURRENT_POS; master_user = 'root', MASTER_USE_GTID=SLAVE_POS, master_demote_to_slave=1;
source include/start_slave.inc; source include/start_slave.inc;
connection server_3; connection server_3;
source include/stop_slave.inc; source include/stop_slave.inc;
--replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 --replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_1, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_1,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
source include/start_slave.inc; source include/start_slave.inc;
connection server_1; connection server_1;

1
mysql-test/suite/rpl/t/rpl_gtid_misc.test
View File

@ -13,7 +13,6 @@ CREATE TABLE t1 (a INT PRIMARY KEY);
SET sql_log_bin= 0; SET sql_log_bin= 0;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
SET sql_log_bin= 1; SET sql_log_bin= 1;
CHANGE MASTER TO master_use_gtid= current_pos;
--connection master --connection master

5
mysql-test/suite/rpl/t/rpl_gtid_nobinlog.test
View File

@ -25,7 +25,7 @@ SELECT * FROM t1 ORDER BY a;
--connection server_1 --connection server_1
--replace_result $SLAVE_MYPORT SLAVE_PORT --replace_result $SLAVE_MYPORT SLAVE_PORT
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SLAVE_MYPORT, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SLAVE_MYPORT,
master_user = 'root', master_use_gtid = current_pos; master_user = 'root';
START SLAVE; START SLAVE;
--source include/wait_for_slave_to_start.inc --source include/wait_for_slave_to_start.inc
@ -49,8 +49,7 @@ INSERT INTO t1 VALUES (6, 1);
--connection server_2 --connection server_2
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT;
master_use_gtid = current_pos;
START SLAVE; START SLAVE;
--source include/sync_with_master_gtid.inc --source include/sync_with_master_gtid.inc

5
mysql-test/suite/rpl/t/rpl_gtid_reconnect.test
View File

@ -4,11 +4,6 @@
--source include/have_debug.inc --source include/have_debug.inc
--connection server_2
--source include/stop_slave.inc
CHANGE MASTER TO master_use_gtid= current_pos;
--source include/start_slave.inc
--connection server_1 --connection server_1
CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT);
FLUSH LOGS; FLUSH LOGS;

2
mysql-test/suite/rpl/t/rpl_gtid_sort.test
View File

@ -47,7 +47,7 @@ SHOW VARIABLES LIKE 'gtid_slave_pos';
SHOW VARIABLES LIKE 'gtid_binlog_state'; SHOW VARIABLES LIKE 'gtid_binlog_state';
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
--source include/start_slave.inc --source include/start_slave.inc
--sync_with_master --sync_with_master
SHOW VARIABLES LIKE 'gtid_binlog_pos'; SHOW VARIABLES LIKE 'gtid_binlog_pos';

10
mysql-test/suite/rpl/t/rpl_gtid_startpos.test
View File

@ -19,7 +19,7 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
SET GLOBAL gtid_slave_pos=""; SET GLOBAL gtid_slave_pos="";
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
--source include/start_slave.inc --source include/start_slave.inc
--sync_with_master --sync_with_master
SELECT * FROM t1; SELECT * FROM t1;
@ -46,7 +46,7 @@ INSERT INTO t1 VALUES (2);
SET GLOBAL gtid_slave_pos=""; SET GLOBAL gtid_slave_pos="";
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
START SLAVE; START SLAVE;
--let $slave_io_errno= 1236 --let $slave_io_errno= 1236
--source include/wait_for_slave_io_error.inc --source include/wait_for_slave_io_error.inc
@ -73,7 +73,7 @@ INSERT INTO t1 VALUES(3);
SET GLOBAL gtid_slave_pos='0-1-3'; SET GLOBAL gtid_slave_pos='0-1-3';
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $MASTER_MYPORT,
MASTER_USE_GTID=CURRENT_POS; MASTER_USE_GTID=SLAVE_POS;
--source include/start_slave.inc --source include/start_slave.inc
--source include/sync_with_master_gtid.inc --source include/sync_with_master_gtid.inc
SELECT * FROM t1 ORDER by a; SELECT * FROM t1 ORDER by a;
@ -118,7 +118,7 @@ RESET MASTER;
--connection server_2 --connection server_2
SET GLOBAL gtid_slave_pos=''; SET GLOBAL gtid_slave_pos='';
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$MASTER_MYPORT, master_user='root', master_use_gtid=current_pos; eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$MASTER_MYPORT, master_user='root', master_use_gtid=slave_pos;
--source include/start_slave.inc --source include/start_slave.inc
--connection server_1 --connection server_1
@ -199,7 +199,7 @@ START SLAVE;
# Going back to using GTID should fix things. # Going back to using GTID should fix things.
STOP SLAVE IO_THREAD; STOP SLAVE IO_THREAD;
CHANGE MASTER TO MASTER_USE_GTID=CURRENT_POS; CHANGE MASTER TO MASTER_USE_GTID=SLAVE_POS;
--source include/start_slave.inc --source include/start_slave.inc
--connection server_1 --connection server_1

1
mysql-test/suite/rpl/t/rpl_gtid_stop_start.test
View File

@ -21,7 +21,6 @@ INSERT INTO t1 VALUES (1);
--let $status_items= Master_Log_File,Using_Gtid --let $status_items= Master_Log_File,Using_Gtid
--source include/show_slave_status.inc --source include/show_slave_status.inc
CHANGE MASTER TO master_use_gtid=current_pos;
# Now try to restart the slave mysqld server without starting the slave first # Now try to restart the slave mysqld server without starting the slave first
# threads after the CHANGE MASTER. # threads after the CHANGE MASTER.

4
mysql-test/suite/rpl/t/rpl_gtid_until.test
View File

@ -45,7 +45,7 @@ START SLAVE UNTIL master_gtid_pos = "";
--error ER_UNTIL_REQUIRES_USING_GTID --error ER_UNTIL_REQUIRES_USING_GTID
START SLAVE UNTIL master_gtid_pos = ""; START SLAVE UNTIL master_gtid_pos = "";
CHANGE MASTER TO master_use_gtid=current_pos; CHANGE MASTER TO master_use_gtid=slave_pos;
--connection server_1 --connection server_1
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
@ -224,7 +224,7 @@ INSERT INTO t1 VALUES (10);
--connection server_2 --connection server_2
--replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 --replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1
eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_1, eval CHANGE MASTER TO master_host = '127.0.0.1', master_port = $SERVER_MYPORT_1,
master_user = "root", master_use_gtid = current_pos; master_user = "root", master_use_gtid = slave_pos;
eval START SLAVE UNTIL master_gtid_pos = '$until_condition'; eval START SLAVE UNTIL master_gtid_pos = '$until_condition';
--source include/wait_for_slave_to_start.inc --source include/wait_for_slave_to_start.inc

1
mysql-test/suite/rpl/t/rpl_mdev6386.test
View File

@ -13,7 +13,6 @@ SET sql_log_bin= 0;
CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends"); CALL mtr.add_suppression("Commit failed due to failure of an earlier commit on which this one depends");
INSERT INTO t1 VALUES (1, 2); INSERT INTO t1 VALUES (1, 2);
SET sql_log_bin= 1; SET sql_log_bin= 1;
CHANGE MASTER TO master_use_gtid= current_pos;
--echo Contents on slave before: --echo Contents on slave before:
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;

1
mysql-test/suite/rpl/t/rpl_parallel_mdev6589.test
View File

@ -7,7 +7,6 @@
SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
--source include/stop_slave.inc --source include/stop_slave.inc
SET GLOBAL slave_parallel_threads=10; SET GLOBAL slave_parallel_threads=10;
CHANGE MASTER TO master_use_gtid=current_pos;
--source include/start_slave.inc --source include/start_slave.inc

2
mysql-test/suite/rpl/t/rpl_parallel_multilevel2.test
View File

@ -25,7 +25,6 @@ SET GLOBAL binlog_commit_wait_usec=2000000;
SET @old_updates= @@GLOBAL.binlog_direct_non_transactional_updates; SET @old_updates= @@GLOBAL.binlog_direct_non_transactional_updates;
SET GLOBAL binlog_direct_non_transactional_updates=OFF; SET GLOBAL binlog_direct_non_transactional_updates=OFF;
SET SESSION binlog_direct_non_transactional_updates=OFF; SET SESSION binlog_direct_non_transactional_updates=OFF;
CHANGE MASTER TO master_use_gtid=current_pos;
--connection server_3 --connection server_3
--sync_with_master --sync_with_master
@ -33,7 +32,6 @@ CHANGE MASTER TO master_use_gtid=current_pos;
SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
--source include/stop_slave.inc --source include/stop_slave.inc
SET GLOBAL slave_parallel_threads=10; SET GLOBAL slave_parallel_threads=10;
CHANGE MASTER TO master_use_gtid=current_pos;
--connection server_1 --connection server_1

1
mysql-test/suite/rpl/t/rpl_parallel_temptable.test
View File

@ -12,7 +12,6 @@
SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads; SET @old_parallel_threads=@@GLOBAL.slave_parallel_threads;
--source include/stop_slave.inc --source include/stop_slave.inc
SET GLOBAL slave_parallel_threads=5; SET GLOBAL slave_parallel_threads=5;
CHANGE MASTER TO master_use_gtid= current_pos;
--source include/start_slave.inc --source include/start_slave.inc
--connection server_1 --connection server_1

3
mysql-test/suite/rpl/t/rpl_start_alter_mysqlbinlog_1.test
View File

@ -1,6 +1,6 @@
# #
# Start Alter with binlog applied using mysqlbinlog # Start Alter with binlog applied using mysqlbinlog
# single maser with only one domain id # single master with only one domain id
# #
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_debug.inc --source include/have_debug.inc
@ -10,7 +10,6 @@
set global binlog_alter_two_phase=true; set global binlog_alter_two_phase=true;
--connection slave --connection slave
--source include/stop_slave.inc --source include/stop_slave.inc
change master to master_use_gtid= current_pos;
set global gtid_strict_mode=1; set global gtid_strict_mode=1;
--echo # Legacy Master Slave --echo # Legacy Master Slave

1
mysql-test/suite/rpl/t/rpl_upgrade_master_info.test
View File

@ -4,7 +4,6 @@
--connection slave --connection slave
--source include/stop_slave.inc --source include/stop_slave.inc
CHANGE MASTER TO master_use_gtid=CURRENT_POS;
--let $datadir= `SELECT @@datadir` --let $datadir= `SELECT @@datadir`
--let $rpl_server_number= 2 --let $rpl_server_number= 2