Commit ef218ff9 authored by unknown's avatar unknown
Browse files

Bug#21011 The [client] group header was overwritten by "password" option in... 

Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option


client/mysql_upgrade.c:
  The "password" option should be issued after group header to upgrade_defaults file whenever it is used
parent 0aa344f3

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