bk commit into 5.0 tree (ted:1.2262) BUG#21011

[Vladimir Shebordaev]

Below is the list of changes that have just been committed into a local
5.0 repository of ted. When ted 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, 2006-09-12 04:59:13+04:00, ted@stripped +1 -0
  Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file
  which confised mysqlcheck thus used to prevent the whole thing from running correctly
  when the "--password=" option is specified on mysql_upgrade command line with no
  correspondidng "--user=" option

  client/mysql_upgrade.c@stripped, 2006-09-12 04:59:10+04:00, ted@stripped +1 -1
    The "password" option should be issued after group header to upgrade_defaults file whenever it is used

# 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:	ted
# Host:	ted.mysql.internal
# Root:	/home/ted/src/mysql/mysql-5.0-maint

--- 1.6/client/mysql_upgrade.c	2006-09-12 04:59:18 +04:00
+++ 1.7/client/mysql_upgrade.c	2006-09-12 04:59:18 +04:00
@@ -200,7 +200,7 @@
   }
   buffer_end= strnmov(buffer, "\n[client]", sizeof(buffer));
   if (opt_password)
-    buffer_end= strxnmov(buffer, sizeof(buffer),
+    buffer_end= strxnmov(buffer_end, sizeof(buffer),
                          "\npassword=", opt_password, NullS);
   error= my_write(defaults_file, buffer, (int) (buffer_end - buffer),
                   MYF(MY_WME | MY_FNABP));