Merge trift2.:/MySQL/M50/mysql-5.0

into  trift2.:/MySQL/M50/push-5.0


client/mysqldump.c:
  Auto merged

2 files changed, 2 insertions, 0 deletions

diff --git a/client/mysql.cc b/client/mysql.cc
index 0a1c1954ea2..483b1829ec0 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1125,6 +1125,7 @@ int main(int argc,char *argv[])
   }
   if (mysql_server_init(emb_argc, emb_argv, (char**) server_default_groups))
   {
+    put_error(NULL);
     free_defaults(defaults_argv);
     my_end(0);
     exit(1);
diff --git a/client/mysqldump.c b/client/mysqldump.c
index fdaf8a9727b..364e80ee56b 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -3306,6 +3306,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);