Commit ef56d39b authored by unknown's avatar unknown
Browse files

Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as after fix for bug 25074

parent 5948063b

client/mysql_upgrade.c

+5 −10
Original line number Diff line number Diff line
@@ -463,9 +463,8 @@ int main(int argc, char **argv) 
  char *forced_defaults_file;

  char *forced_extra_defaults;

  char *local_defaults_group_suffix;

  int no_defaults;

  char path[FN_REFLEN], upgrade_defaults_path[FN_REFLEN];



  char path[FN_REFLEN], upgrade_defaults_path[FN_REFLEN];

  DYNAMIC_STRING cmdline;



  MY_INIT(argv[0]);
@@ -587,9 +586,7 @@ int main(int argc, char **argv) 
    instruct mysqlcheck to only read options from that file

  */

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline,

                          (no_defaults ? "--defaults-file=" :

                           "--defaults-extra-file="),

  dynstr_append_os_quoted(&cmdline, "--defaults-file=",

                          upgrade_defaults_path, NullS);

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline, "--check-upgrade", NullS);
@@ -664,9 +661,7 @@ int main(int argc, char **argv) 
    instruct mysql to only read options from that file

  */

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline,

                          (no_defaults ? "--defaults-file=" :

                           "--defaults-extra-file="),

  dynstr_append_os_quoted(&cmdline, "--defaults-file=",

                          upgrade_defaults_path, NullS);

  dynstr_append(&cmdline, " ");

  dynstr_append_os_quoted(&cmdline, "--force", NullS);