Bug #34909: mysqldump returns a 0 status on error when using

gkodinov/kgeorge@magare.gmz · gkodinov/kgeorge@magare.gmz · commit 11cd97ed6b3c · 2008-03-07T11:15:49.000+02:00
--master-data

No error code was returned by mysqldump if it detects that binary
logging is not enabled on the server.
Fixed by returning error code.
diff --git a/client/mysqldump.c b/client/mysqldump.c
@@ -3285,6 +3285,7 @@ static int do_show_master_status(MYSQL *mysql_con)
       my_printf_error(0, "Error: Binlogging on server not active",
                       MYF(0));
       mysql_free_result(master);
+      maybe_exit(EX_MYSQLERR);
       return 1;
     }
     mysql_free_result(master);
diff --git a/mysql-test/r/mysqldump-no-binlog.result b/mysql-test/r/mysqldump-no-binlog.result
@@ -0,0 +1 @@
+mysqldump: Error: Binlogging on server not active
diff --git a/mysql-test/t/mysqldump-no-binlog-master.opt b/mysql-test/t/mysqldump-no-binlog-master.opt
@@ -0,0 +1 @@
+--skip-log-bin
diff --git a/mysql-test/t/mysqldump-no-binlog.test b/mysql-test/t/mysqldump-no-binlog.test
@@ -0,0 +1,6 @@
+# Embedded server doesn't support external clients
+--source include/not_embedded.inc
+
+--replace_regex /MASTER_LOG_POS=[0-9]+/XX/
+--error 2
+--exec $MYSQL_DUMP --compact --master-data=2 test 2>&1

Original file line number	Diff line number	Diff line change
`@@ -3285,6 +3285,7 @@ static int do_show_master_status(MYSQL *mysql_con)`
`3285`	`3285`	`my_printf_error(0, "Error: Binlogging on server not active",`
`3286`	`3286`	`MYF(0));`
`3287`	`3287`	`mysql_free_result(master);`
	`3288`	`+ maybe_exit(EX_MYSQLERR);`
`3288`	`3289`	`return 1;`
`3289`	`3290`	`}`
`3290`	`3291`	`mysql_free_result(master);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+mysqldump: Error: Binlogging on server not active`