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

Merge trift2.:/MySQL/M50/mysql-5.0

Browse Source 
into  trift2.:/MySQL/M50/push-5.0


client/mysql_upgrade.c:
  Auto merged
This commit is contained in:
unknown
2006-12-28 18:22:43 +01:00
parent 655650f58c e26b3aefdb
commit e9adafcdf6
7 changed files with 60 additions and 7 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;