mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 02:05:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
This commit is contained in:
unknown 2007-01-01 05:35:10 +01:00
commit ec08ea7058
9 changed files with 81 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/mysql_upgrade.c
View file

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