Commit 560ec240 authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  magare.gmz:/home/kgeorge/mysql/autopush/B34909-5.0-opt
parents f883250f 11cd97ed

client/mysqldump.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

mysql-test/r/mysqldump-no-binlog.result

0 → 100644
+1 −0
Original line number Diff line number Diff line 
mysqldump: Error: Binlogging on server not active

mysql-test/t/mysqldump-no-binlog-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--skip-log-bin

mysql-test/t/mysqldump-no-binlog.test

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# 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