bk commit into 5.1 tree (ted:1.2324)

[Vladimir Shebordaev]

Below is the list of changes that have just been committed into a local
5.1 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-15 04:14:46+04:00, ted@stripped +1 -0
  Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca
  into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.1697.142

  client/mysql_upgrade.c@stripped, 2006-09-15 04:14:42+04:00, ted@stripped +0 -0
    Auto merged
    MERGE: 1.6.1.1

# 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.1-new-maint/RESYNC

--- 1.7/client/mysql_upgrade.c	2006-09-15 04:14:54 +04:00
+++ 1.8/client/mysql_upgrade.c	2006-09-15 04:14:54 +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));