diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-08 11:19:48 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-08 11:19:48 +0200 |
| commit | c67b306e4f90788b979bf85f5a2ab282798fc897 (patch) | |
| tree | b7fa51ab7bacbf5ed8c20367f009625a7da0f95b /client/mysqladmin.cc | |
| parent | 91d7e7b244be2ebf39eb135bacea99ed19657475 (diff) | |
| parent | 94eb56fb29334a1075103becb625685b23f7d437 (diff) | |
| download | mariadb-git-c67b306e4f90788b979bf85f5a2ab282798fc897.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 35afe06eade..66678f3fd77 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -310,7 +310,6 @@ int main(int argc,char *argv[]) char **commands, **save_argv, **temp_argv; MY_INIT(argv[0]); - mysql_init(&mysql); sf_leaking_memory=1; /* don't report memory leaks on early exits */ load_defaults_or_exit("my", load_default_groups, &argc, &argv); save_argv = argv; /* Save for free_defaults */ @@ -339,6 +338,7 @@ int main(int argc,char *argv[]) sf_leaking_memory=0; /* from now on we cleanup properly */ + mysql_init(&mysql); if (opt_compress) mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS); if (opt_connect_timeout) |