diff options
| author | ted@ted.mysql.internal <> | 2006-09-15 04:32:58 +0400 |
|---|---|---|
| committer | ted@ted.mysql.internal <> | 2006-09-15 04:32:58 +0400 |
| commit | 5610ef3018b1ade151137070730c358ec9dd9a8c (patch) | |
| tree | 670688bfbb24e5ac0788e89b982b4c8d5e96b7a0 /client | |
| parent | 02833f49c38745688f94f049cc1f306bc9dc8f51 (diff) | |
| parent | cb08c534a0a0e0f069acd170cd20623364f4ce7c (diff) | |
| download | mariadb-git-5610ef3018b1ade151137070730c358ec9dd9a8c.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
Diffstat (limited to 'client')
| -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)); |