diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 01:01:52 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 01:01:52 +0200 |
| commit | a6481aa4c7016c996a9787db4824307c705ec8a1 (patch) | |
| tree | b60f635d3126e8d0f1321f0187390d7cf8496558 /client/mysql_upgrade.c | |
| parent | 95564bfea31aef4686ae4e7c6d422e2a20a5d73a (diff) | |
| parent | 88dd873de0d5dc6e8f262268f925596a60b58704 (diff) | |
| download | mariadb-git-a6481aa4c7016c996a9787db4824307c705ec8a1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index cce4b440be0..648ea0ae633 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -440,7 +440,7 @@ int main(int argc, char **argv) char *forced_defaults_file; char *forced_extra_defaults; - char *defaults_group_suffix; + char *local_defaults_group_suffix; const char *script_line; char *upgrade_defaults_path; char *defaults_to_use= NULL; @@ -457,7 +457,7 @@ int main(int argc, char **argv) /* Check if we are forced to use specific defaults */ get_defaults_options(argc, argv, &forced_defaults_file, &forced_extra_defaults, - &defaults_group_suffix); + &local_defaults_group_suffix); load_defaults("my", load_default_groups, &argc, &argv); |