diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-28 17:06:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-28 17:31:57 +0200 |
| commit | b1818dccf772e0fd495502c6dfc1600853e007d0 (patch) | |
| tree | d9c441c38681d634d50cf36021a3bf439b2e44ca /client/mysql_upgrade.c | |
| parent | c34602995894c9a04f4312484cfe6e45c43426e6 (diff) | |
| parent | aafb9d44d65e42df72af28c940e5b23b4bc3bd43 (diff) | |
| download | mariadb-git-b1818dccf772e0fd495502c6dfc1600853e007d0.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index c7ef8bfc47a..0e0695c9ebe 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -1141,6 +1141,8 @@ int main(int argc, char **argv) char self_name[FN_REFLEN + 1]; MY_INIT(argv[0]); + load_defaults_or_exit("my", load_default_groups, &argc, &argv); + defaults_argv= argv; /* Must be freed by 'free_defaults' */ #if __WIN__ if (GetModuleFileName(NULL, self_name, FN_REFLEN) == 0) @@ -1153,10 +1155,6 @@ int main(int argc, char **argv) init_dynamic_string(&conn_args, "", 512, 256)) die("Out of memory"); - if (load_defaults("my", load_default_groups, &argc, &argv)) - die(NULL); - defaults_argv= argv; /* Must be freed by 'free_defaults' */ - if (handle_options(&argc, &argv, my_long_options, get_one_option)) die(NULL); if (debug_info_flag) |