diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-03-08 07:55:03 +0100 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-03-08 07:55:03 +0100 |
| commit | ef56d39bcc1c5acc1b0dd43ccd9addd8777a4dfe (patch) | |
| tree | bf4ede33644708685c78de36f590300b51b32f67 /client | |
| parent | 5948063b2dc7306cf5887caceda889ba12cd4311 (diff) | |
| download | mariadb-git-ef56d39bcc1c5acc1b0dd43ccd9addd8777a4dfe.tar.gz | |
Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as after fix for bug 25074
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_upgrade.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index ea12e9fe057..e6870c23129 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -173,7 +173,7 @@ void set_extra_default(int id, const struct my_option *opt) } d= (extra_default_t *)my_malloc(sizeof(extra_default_t), - MYF(MY_FAE | MY_ZEROFILL)); + MYF(MY_FAE|MY_ZEROFILL)); d->id= id; d->name= opt->name; d->n_len= strlen(opt->name); @@ -366,7 +366,7 @@ static int create_defaults_file(const char *path, const char *forced_path) goto error; } DBUG_PRINT("info", ("%s", buf.str)); - my_free((gptr) d, MYF(0)); + my_free((gptr)d, MYF(0)); list_pop(extra_defaults); /* pop off the head */ } if (my_write(defaults_file, buf.str, buf.length, MYF(MY_FNABP | MY_WME))) @@ -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 @@ fix_priv_tables: 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); |