mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge branch '10.6' into 10.11
This commit is contained in:
@@ -85,5 +85,16 @@ SELECT VARIABLE_NAME, GLOBAL_VALUE FROM INFORMATION_SCHEMA.SYSTEM_VARIABLES WHER
|
||||
--eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$MASTER_MYPORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1
|
||||
--source include/start_slave.inc
|
||||
|
||||
# Ensure master is ready to start sending new transactions. That is, because
|
||||
# the master does not have log_slave_updates, the slave's transactions of
|
||||
# repl_t are not binlogged, and its state is behind. If the master binlogs
|
||||
# any new transactions before the slaves connection is matured,
|
||||
# ER_GTID_POSITION_NOT_FOUND_IN_BINLOG2 can be reported to the slave
|
||||
# FIXME: We shouldn't need to do this, rather, the master should use
|
||||
# log-slave-updates and gtid-strict-mode
|
||||
--connection master
|
||||
--let $wait_condition= SELECT COUNT(*) > 0 FROM information_schema.processlist WHERE State like '%Master has sent all binlog to slave%'
|
||||
--source include/wait_condition.inc
|
||||
|
||||
--let $include_filename= rpl_change_master_demote.inc
|
||||
--source include/end_include_file.inc
|
||||
|
Reference in New Issue
Block a user