diff options
| author | Michael Widenius <monty@askmonty.org> | 2014-02-11 23:41:56 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2014-02-11 23:41:56 +0200 |
| commit | 3474bb04ecdda1af71da673501b29854726b3eda (patch) | |
| tree | f19ba7ddb3a946adc5281a5fc7bb03f6dbfec7c5 /client | |
| parent | 3f4337103a89d16f30ebab516f206397efdd0392 (diff) | |
| download | mariadb-git-3474bb04ecdda1af71da673501b29854726b3eda.tar.gz | |
Fixed that --apply-slave-statements also uses multi-source
mysql-test/r/rpl_mysqldump_slave.result:
Updated test result
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index d244e928f6e..151cbb66141 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -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); } |