Commit 38d2f595 authored by unknown's avatar unknown
Browse files

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
parents 3f190bed ef218ff9

client/mysql_upgrade.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int create_defaults_file(const char *path, const char *our_defaults_path) 
  }

  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));