Commit 5c18ba6c authored by Sergey Vojtovich's avatar Sergey Vojtovich

Fixed Spider to follow THD ha_data protocol

Do not reset THD ha_data in spider_close_connection(), cleaner approach
is to let ha_close_connection() do it.

Part of MDEV-19515 - Improve connect speed
parent 762d2b96
...@@ -6576,7 +6576,7 @@ int spider_close_connection( ...@@ -6576,7 +6576,7 @@ int spider_close_connection(
} }
spider_rollback(spider_hton_ptr, thd, TRUE); spider_rollback(spider_hton_ptr, thd, TRUE);
spider_free_trx(trx, TRUE); spider_free_trx(trx, TRUE, false);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
......
...@@ -1557,7 +1557,8 @@ SPIDER_TRX *spider_get_trx( ...@@ -1557,7 +1557,8 @@ SPIDER_TRX *spider_get_trx(
int spider_free_trx( int spider_free_trx(
SPIDER_TRX *trx, SPIDER_TRX *trx,
bool need_lock bool need_lock,
bool reset_ha_data
) { ) {
DBUG_ENTER("spider_free_trx"); DBUG_ENTER("spider_free_trx");
if (trx->thd) if (trx->thd)
...@@ -1575,7 +1576,8 @@ int spider_free_trx( ...@@ -1575,7 +1576,8 @@ int spider_free_trx(
if (need_lock) if (need_lock)
pthread_mutex_unlock(&spider_allocated_thds_mutex); pthread_mutex_unlock(&spider_allocated_thds_mutex);
} }
thd_set_ha_data(trx->thd, spider_hton_ptr, NULL); if (reset_ha_data)
thd_set_ha_data(trx->thd, spider_hton_ptr, NULL);
} }
spider_free_trx_alloc(trx); spider_free_trx_alloc(trx);
spider_merge_mem_calc(trx, TRUE); spider_merge_mem_calc(trx, TRUE);
......
...@@ -80,7 +80,8 @@ SPIDER_TRX *spider_get_trx( ...@@ -80,7 +80,8 @@ SPIDER_TRX *spider_get_trx(
int spider_free_trx( int spider_free_trx(
SPIDER_TRX *trx, SPIDER_TRX *trx,
bool need_lock bool need_lock,
bool reset_ha_data= true
); );
int spider_check_and_set_trx_isolation( int spider_check_and_set_trx_isolation(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment