database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

BUG#24896 mysql_upgrade -p fix

Browse Source
This commit is contained in:
df@kahlann.erinye.com
2006-12-08 10:23:03 +01:00
parent 75c7114124
commit 8375e6684d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/mysql_upgrade.c
View File

@@ -142,6 +142,7 @@ void set_extra_default(int id, const struct my_option *opt)
case 'f': /* --force is ours */ case 'f': /* --force is ours */
case 'u': /* --user passed on cmdline */ case 'u': /* --user passed on cmdline */
case 'T': /* --debug-info is not accepted by mysqlcheck */ case 'T': /* --debug-info is not accepted by mysqlcheck */
case 'p': /* --password may change yet */
/* so, do nothing */ /* so, do nothing */
break; break;
default: default:
@@ -173,7 +174,7 @@ void set_extra_default(int id, const struct my_option *opt)
d->id= id; d->id= id;
d->name= opt->name; d->name= opt->name;
d->n_len= strlen(opt->name); d->n_len= strlen(opt->name);
if (opt->arg_type != NO_ARG) if (opt->arg_type != NO_ARG && opt->value)
switch (opt->var_type & GET_TYPE_MASK) { switch (opt->var_type & GET_TYPE_MASK) {
case GET_BOOL: case GET_BOOL:
if (*((int *)opt->value)) if (*((int *)opt->value))
@@ -319,6 +320,15 @@ static int create_defaults_file(const char *path, const char *forced_path)
} }
dynstr_set(&buf, "\n[client]"); dynstr_set(&buf, "\n[client]");
if (opt_password)
{
if (dynstr_append_mem(&buf, "\npassword=", 10)
|| dynstr_append_mem(&buf, opt_password, strlen(opt_password)))
{
ret = 1;
goto error;
}
}
while (extra_defaults) while (extra_defaults)
{ {
int len; int len;