Merge magare.gmz:/home/kgeorge/mysql/work/B34909-5.0-opt

into  magare.gmz:/home/kgeorge/mysql/work/B34909-5.1-opt


client/mysqldump.c:
  Auto merged

client/mysqldump.c

@@ -4306,6 +4306,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

+mysqldump: Error: Binlogging on server not active

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

+--skip-log-bin

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

+# 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