bk commit into 5.0 tree (lars:1.1888)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lars. When lars 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
  1.1888 05/07/05 15:39:49 lars@stripped +1 -0
  Merge mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/home/bk/mysql-5.0

  client/mysqldump.c
    1.186 05/07/05 15:39:39 lars@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	goldfish.site
# Root:	/home/bk/mysql-5.0/RESYNC

--- 1.185/client/mysqldump.c	2005-07-03 13:17:45 +02:00
+++ 1.186/client/mysqldump.c	2005-07-05 15:39:39 +02:00
@@ -2561,6 +2561,7 @@
     row = mysql_fetch_row(master);
     if (row && row[0] && row[1])
     {
+      /* SHOW MASTER STATUS reports file and position */
       if (opt_comments)
         fprintf(md_result_file,
                 "\n--\n-- Position to start replication or point-in-time "
@@ -2569,6 +2570,14 @@
               "%sCHANGE MASTER TO MASTER_LOG_FILE='%s', MASTER_LOG_POS=%s;\n",
               comment_prefix, row[0], row[1]); 
       check_io(md_result_file);
+    }
+    else if (!ignore_errors)
+    {
+      /* SHOW MASTER STATUS reports nothing and --force is not enabled */
+      my_printf_error(0, "Error: Binlogging on server not active", 
+		      MYF(0), mysql_error(mysql_con));
+      mysql_free_result(master);
+      return 1;
     }
     mysql_free_result(master);
   }