mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-21 15:55:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed that --apply-slave-statements also uses multi-source

Browse source 
mysql-test/r/rpl_mysqldump_slave.result:
  Updated test result
This commit is contained in:
Michael Widenius 2014-02-11 23:41:56 +02:00
commit 3474bb04ec
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/mysqldump.c
View file

@ -4826,10 +4826,10 @@ static int add_stop_slave(void)
if (opt_comments)
fprintf(md_result_file,
"\n--\n-- stop slave statement to make a recovery dump)\n--\n\n");
fprintf(md_result_file, "STOP SLAVE;\n");
#ifdef WHEN_55_CAN_HANDLE_LONG_VERSION_STRINGS
fprintf(md_result_file, "/*M!100000 STOP ALL SLAVES */;\n");
#endif
if (multi_source)
fprintf(md_result_file, "STOP ALL SLAVES;\n");
else
fprintf(md_result_file, "STOP SLAVE;\n");
return(0);
}
@ -4838,7 +4838,10 @@ static int add_slave_statements(void)
if (opt_comments)
fprintf(md_result_file,
"\n--\n-- start slave statement to make a recovery dump)\n--\n\n");
fprintf(md_result_file, "START SLAVE;\n");
if (multi_source)
fprintf(md_result_file, "START ALL SLAVES;\n");
else
fprintf(md_result_file, "START SLAVE;\n");
return(0);
}

8
mysql-test/r/rpl_mysqldump_slave.result
View file

@ -5,10 +5,10 @@ include/master-slave.inc
#
use test;
CHANGE MASTER "" TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
STOP SLAVE;
STOP ALL SLAVES;
CHANGE MASTER "" TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
START SLAVE;
STOP SLAVE;
START ALL SLAVES;
STOP ALL SLAVES;
CHANGE MASTER "" TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT, MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
START SLAVE;
START ALL SLAVES;
include/rpl_end.inc