database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-5321 Calling mysql_library_end accesses freed memory; dumps memory to display.

Browse Source 
Don't call the vio_end() in the clean_up() in EMBEDDED mode.
        Call vio_end() before the end_embedded_server().
This commit is contained in:
Alexey Botchkov
2013-11-25 21:38:01 +04:00
parent 1297a9ef19
commit fb2de58294
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmysql/libmysql.c
View File

@@ -204,11 +204,11 @@ void STDCALL mysql_server_end()
mysql_client_plugin_deinit(); mysql_client_plugin_deinit();
finish_client_errs();
vio_end();
#ifdef EMBEDDED_LIBRARY #ifdef EMBEDDED_LIBRARY
end_embedded_server(); end_embedded_server();
#endif #endif
finish_client_errs();
vio_end();
/* If library called my_init(), free memory allocated by it */ /* If library called my_init(), free memory allocated by it */
if (!org_my_init_done) if (!org_my_init_done)

2
sql/mysqld.cc
View File

@@ -1851,7 +1851,9 @@ void clean_up(bool print_message)
delete binlog_filter; delete binlog_filter;
delete rpl_filter; delete rpl_filter;
end_ssl(); end_ssl();
#ifndef EMBEDDED_LIBRARY
vio_end(); vio_end();
#endif /*!EMBEDDED_LIBRARY*/
my_regex_end(); my_regex_end();
#if defined(ENABLED_DEBUG_SYNC) #if defined(ENABLED_DEBUG_SYNC)
/* End the debug sync facility. See debug_sync.cc. */ /* End the debug sync facility. See debug_sync.cc. */