database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

THD:: cleanup() must be where it used to

Browse Source 
between net_end() and ha_close_connection()

this fixes lockups in main.locked_temporary-5955 and some
other innodb tests.
This commit is contained in:
Sergei Golubchik
2016-05-08 22:16:44 +02:00
parent 69da361ccd
commit 725ce0fe84
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@ -1650,6 +1650,8 @@ void THD::free_connection()
net.vio= 0; net.vio= 0;
net_end(&net); net_end(&net);
#endif #endif
if (!cleanup_done)
cleanup();
ha_close_connection(this); ha_close_connection(this);
plugin_thdvar_cleanup(this); plugin_thdvar_cleanup(this);
mysql_audit_free_thd(this); mysql_audit_free_thd(this);
@ -1719,8 +1721,6 @@ THD::~THD()
#endif #endif
if (!free_connection_done) if (!free_connection_done)
free_connection(); free_connection();
if (!cleanup_done)
cleanup();
mdl_context.destroy(); mdl_context.destroy();