Commit 3474bb04 authored by Michael Widenius's avatar Michael Widenius

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

mysql-test/r/rpl_mysqldump_slave.result:
  Updated test result
parent 3f433710
...@@ -4826,10 +4826,10 @@ static int add_stop_slave(void) ...@@ -4826,10 +4826,10 @@ static int add_stop_slave(void)
if (opt_comments) if (opt_comments)
fprintf(md_result_file, fprintf(md_result_file,
"\n--\n-- stop slave statement to make a recovery dump)\n--\n\n"); "\n--\n-- stop slave statement to make a recovery dump)\n--\n\n");
fprintf(md_result_file, "STOP SLAVE;\n"); if (multi_source)
#ifdef WHEN_55_CAN_HANDLE_LONG_VERSION_STRINGS fprintf(md_result_file, "STOP ALL SLAVES;\n");
fprintf(md_result_file, "/*M!100000 STOP ALL SLAVES */;\n"); else
#endif fprintf(md_result_file, "STOP SLAVE;\n");
return(0); return(0);
} }
...@@ -4838,7 +4838,10 @@ static int add_slave_statements(void) ...@@ -4838,7 +4838,10 @@ static int add_slave_statements(void)
if (opt_comments) if (opt_comments)
fprintf(md_result_file, fprintf(md_result_file,
"\n--\n-- start slave statement to make a recovery dump)\n--\n\n"); "\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); return(0);
} }
......
...@@ -5,10 +5,10 @@ include/master-slave.inc ...@@ -5,10 +5,10 @@ include/master-slave.inc
# #
use test; use test;
CHANGE MASTER "" TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START; 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; CHANGE MASTER "" TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
START SLAVE; START ALL SLAVES;
STOP SLAVE; 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; 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 include/rpl_end.inc
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment