mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge branch '10.1' into 10.2
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
include/master-slave.inc
|
||||
[connection master]
|
||||
connection slave;
|
||||
include/sync_slave_sql_with_master.inc
|
||||
SET @start_max_connections= @@global.max_connections;
|
||||
SET @start_init_slave= @@global.init_slave;
|
||||
SET NAMES utf8;
|
||||
@@ -19,18 +19,12 @@ SELECT @@global.init_slave = 'SET @@global.max_connections = @@global.max_connec
|
||||
1
|
||||
Expect 1
|
||||
include/assert.inc [@@global.max_connections = @start_max_connections]
|
||||
STOP SLAVE;
|
||||
RESET MASTER;
|
||||
RESET SLAVE;
|
||||
START SLAVE;
|
||||
include/wait_for_slave_to_start.inc
|
||||
include/restart_slave.inc
|
||||
connection master;
|
||||
include/sync_slave_sql_with_master.inc
|
||||
include/assert.inc [@@global.max_connections = @start_max_connections + 1]
|
||||
SET @@global.init_slave = "SET @a=5";
|
||||
STOP SLAVE;
|
||||
RESET MASTER;
|
||||
RESET SLAVE;
|
||||
START SLAVE;
|
||||
include/wait_for_slave_to_start.inc
|
||||
include/restart_slave.inc
|
||||
SHOW VARIABLES LIKE 'init_slave';
|
||||
Variable_name Value
|
||||
init_slave SET @a=5
|
||||
|
Reference in New Issue
Block a user