diff options
| author | unknown <ted@ted.mysql.internal> | 2006-09-15 04:32:58 +0400 |
|---|---|---|
| committer | unknown <ted@ted.mysql.internal> | 2006-09-15 04:32:58 +0400 |
| commit | f8c521a42d45f98b3de94dbaca9803c5690207d3 (patch) | |
| tree | 670688bfbb24e5ac0788e89b982b4c8d5e96b7a0 | |
| parent | 33a0f0d9d8a1b1275a665384165061ce53bb2345 (diff) | |
| parent | e5a1c5256df08acac350d0f6089d745dbd4ee9c5 (diff) | |
| download | mariadb-git-f8c521a42d45f98b3de94dbaca9803c5690207d3.tar.gz | |
Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint
into ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca
| -rw-r--r-- | client/mysql_upgrade.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 9a73263f558..6ec361392c8 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -200,7 +200,7 @@ retry_open: } 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)); |