bk commit into 5.0 tree (gkodinov:1.2596) BUG#34909

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of gkodinov.  When gkodinov does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-29 18:00:34+02:00, gkodinov@stripped +4 -0
  Bug #34909: mysqldump returns a 0 status on error when using 
    --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.

  client/mysqldump.c@stripped, 2008-02-29 18:00:33+02:00, gkodinov@stripped +1 -0
    Bug #34909: add error code

  mysql-test/r/mysqldump-no-binlog.result@stripped, 2008-02-29 18:00:33+02:00,
gkodinov@stripped +1 -0
    Bug #34909: test case

  mysql-test/r/mysqldump-no-binlog.result@stripped, 2008-02-29 18:00:33+02:00,
gkodinov@stripped +0 -0

  mysql-test/t/mysqldump-no-binlog-master.opt@stripped, 2008-02-29 18:00:33+02:00,
gkodinov@stripped +1 -0
    Bug #34909: test case

  mysql-test/t/mysqldump-no-binlog-master.opt@stripped, 2008-02-29 18:00:33+02:00,
gkodinov@stripped +0 -0

  mysql-test/t/mysqldump-no-binlog.test@stripped, 2008-02-29 18:00:33+02:00,
gkodinov@stripped +6 -0
    Bug #34909: test case

  mysql-test/t/mysqldump-no-binlog.test@stripped, 2008-02-29 18:00:33+02:00,
gkodinov@stripped +0 -0

diff -Nrup a/client/mysqldump.c b/client/mysqldump.c
--- a/client/mysqldump.c	2007-12-05 05:07:00 +02:00
+++ b/client/mysqldump.c	2008-02-29 18:00:33 +02:00
@@ -3285,6 +3285,7 @@ static int do_show_master_status(MYSQL *
       my_printf_error(0, "Error: Binlogging on server not active",
                       MYF(0));
       mysql_free_result(master);
+      maybe_exit(EX_USAGE);
       return 1;
     }
     mysql_free_result(master);
diff -Nrup a/mysql-test/r/mysqldump-no-binlog.result
b/mysql-test/r/mysqldump-no-binlog.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/mysqldump-no-binlog.result	2008-02-29 18:00:33 +02:00
@@ -0,0 +1 @@
+mysqldump: Error: Binlogging on server not active
diff -Nrup a/mysql-test/t/mysqldump-no-binlog-master.opt
b/mysql-test/t/mysqldump-no-binlog-master.opt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/mysqldump-no-binlog-master.opt	2008-02-29 18:00:33 +02:00
@@ -0,0 +1 @@
+--skip-log-bin
diff -Nrup a/mysql-test/t/mysqldump-no-binlog.test b/mysql-test/t/mysqldump-no-binlog.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/t/mysqldump-no-binlog.test	2008-02-29 18:00:33 +02:00
@@ -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 1
+--exec $MYSQL_DUMP --compact --master-data=2 test 2>&1