Commit df80725a authored by unknown's avatar unknown

BUG#11678: mysqldump --master-data should fail if master binlog disabled


client/mysqldump.c:
  Add error message in case master does not have binlogging enabled
parent 45ea95f4
...@@ -2356,6 +2356,7 @@ static int do_show_master_status(MYSQL *mysql_con) ...@@ -2356,6 +2356,7 @@ static int do_show_master_status(MYSQL *mysql_con)
row = mysql_fetch_row(master); row = mysql_fetch_row(master);
if (row && row[0] && row[1]) if (row && row[0] && row[1])
{ {
/* SHOW MASTER STATUS reports file and position */
if (opt_comments) if (opt_comments)
fprintf(md_result_file, fprintf(md_result_file,
"\n--\n-- Position to start replication or point-in-time " "\n--\n-- Position to start replication or point-in-time "
...@@ -2365,6 +2366,14 @@ static int do_show_master_status(MYSQL *mysql_con) ...@@ -2365,6 +2366,14 @@ static int do_show_master_status(MYSQL *mysql_con)
comment_prefix, row[0], row[1]); comment_prefix, row[0], row[1]);
check_io(md_result_file); check_io(md_result_file);
} }
else if (!ignore_errors)
{
/* SHOW MASTER STATUS reports nothing and --force is not enabled */
my_printf_error(0, "Error: Binlogging on server not active",
MYF(0), mysql_error(mysql_con));
mysql_free_result(master);
return 1;
}
mysql_free_result(master); mysql_free_result(master);
} }
return 0; return 0;
......
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