diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-05 20:12:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-06 15:28:27 +0100 |
| commit | 2f742b571f93e8c4a87145ee80757192f14a019b (patch) | |
| tree | 2c977d90c7e8c0f01f5ee55c87771b8c50e5b8bf | |
| parent | 65070beffd2e9279145b48d1f27c517b6588e543 (diff) | |
| download | mariadb-git-2f742b571f93e8c4a87145ee80757192f14a019b.tar.gz | |
MDEV-18376 Memory leak in main.mysqladmin
don't initialize mysql structure before it actually becomes needed.
This fixes main.mysqladmin failures
in ASAN_OPTIONS="abort_on_error=1" runs
| -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 5e7fb80b2b5..b5e54be899a 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -318,7 +318,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 */ @@ -347,6 +346,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) |