mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
tsmith@quadxeon.mysql.com 2007-03-08 07:55:03 +01:00
parent 8a065c02b4
commit ec87168115
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
client/mysql_upgrade.c
View file

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