mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
Move calling of thr_local_free() from trx_free_for_mysql() to
innobase_close_connection().
This commit is contained in:
parent
fd93a09ed0
commit
8289f64a58
2 changed files with 2 additions and 2 deletions
|
@ -132,6 +132,7 @@ extern "C" {
|
|||
#include "../storage/innobase/include/sync0sync.h"
|
||||
#include "../storage/innobase/include/fil0fil.h"
|
||||
#include "../storage/innobase/include/trx0xa.h"
|
||||
#include "../storage/innobase/include/thr0loc.h"
|
||||
}
|
||||
|
||||
#define HA_INNOBASE_ROWS_IN_TABLE 10000 /* to get optimization right */
|
||||
|
@ -2298,6 +2299,7 @@ innobase_close_connection(
|
|||
|
||||
innobase_rollback_trx(trx);
|
||||
|
||||
thr_local_free(trx->mysql_thread_id);
|
||||
trx_free_for_mysql(trx);
|
||||
|
||||
return(0);
|
||||
|
|
|
@ -366,8 +366,6 @@ trx_free_for_mysql(
|
|||
/*===============*/
|
||||
trx_t* trx) /* in, own: trx object */
|
||||
{
|
||||
thr_local_free(trx->mysql_thread_id);
|
||||
|
||||
mutex_enter(&kernel_mutex);
|
||||
|
||||
UT_LIST_REMOVE(mysql_trx_list, trx_sys->mysql_trx_list, trx);
|
||||
|
|
Loading…
Reference in a new issue