diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 19:51:44 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 19:51:44 +0200 |
| commit | e509065247b1a0cda0bc7863ac1d43d0fab9acc8 (patch) | |
| tree | 0a89b1350bbf06177b63c92111e769a71a4b84c0 /client/mysqlimport.c | |
| parent | 8fd8a81a9933e6a5b8afe2e7a2655652bd7c7190 (diff) | |
| parent | 37a3d4467e3115f4d4dfcad0a6ee3c23e785f524 (diff) | |
| download | mariadb-git-e509065247b1a0cda0bc7863ac1d43d0fab9acc8.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index e72eb12cb99..1d2119c7b89 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -514,13 +514,15 @@ static void safe_exit(int error, MYSQL *mysql) if (mysql) mysql_close(mysql); - mysql_library_end(); - free_defaults(argv_to_free); - my_free(opt_password); if (error) sf_leaking_memory= 1; /* dirty exit, some threads are still running */ else + { + mysql_library_end(); + free_defaults(argv_to_free); + my_free(opt_password); my_end(my_end_arg); /* clean exit */ + } exit(error); } |