diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2013-11-25 21:38:01 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2013-11-25 21:38:01 +0400 |
| commit | fb2de582941e77830133bde20e439fcad73b9a11 (patch) | |
| tree | af9854f148468d804f23a2ee94e1809fafe5f6dc /libmysql | |
| parent | 1297a9ef19be9e3f3c42316d12a5aaf53a9f4ca1 (diff) | |
| download | mariadb-git-fb2de582941e77830133bde20e439fcad73b9a11.tar.gz | |
MDEV-5321 Calling mysql_library_end accesses freed memory; dumps memory to display.
Don't call the vio_end() in the clean_up() in EMBEDDED mode.
Call vio_end() before the end_embedded_server().
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index a6b7d2d6c8a..242144abc50 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -204,11 +204,11 @@ void STDCALL mysql_server_end() mysql_client_plugin_deinit(); + finish_client_errs(); + vio_end(); #ifdef EMBEDDED_LIBRARY end_embedded_server(); #endif - finish_client_errs(); - vio_end(); /* If library called my_init(), free memory allocated by it */ if (!org_my_init_done) |