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

MDEV-22696 Threadpool : make sure thd->event_scheduler.data does not change as long as THD is in server_threads.

Browse Source
This commit is contained in:
Vladislav Vaintroub
2020-05-24 17:13:12 +02:00
parent 17437eb259
commit 9aa6042a0d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/threadpool_common.cc
View File

@ -211,12 +211,11 @@ void tp_callback(TP_connection *c)
error: error:
c->thd= 0; c->thd= 0;
delete c;
if (thd) if (thd)
{ {
threadpool_remove_connection(thd); threadpool_remove_connection(thd);
} }
delete c;
worker_context.restore(); worker_context.restore();
} }
@ -243,9 +242,11 @@ static THD* threadpool_add_connection(CONNECT *connect, void *scheduler_data)
return NULL; return NULL;
} }
delete connect; delete connect;
thd->event_scheduler.data = scheduler_data;
server_threads.insert(thd); server_threads.insert(thd);
thd->set_mysys_var(mysys_var); thd->set_mysys_var(mysys_var);
thd->event_scheduler.data= scheduler_data;
/* Login. */ /* Login. */
thread_attach(thd); thread_attach(thd);
@ -280,7 +281,6 @@ end:
static void threadpool_remove_connection(THD *thd) static void threadpool_remove_connection(THD *thd)
{ {
thread_attach(thd); thread_attach(thd);
thd->event_scheduler.data= 0;
thd->net.reading_or_writing = 0; thd->net.reading_or_writing = 0;
end_connection(thd); end_connection(thd);
close_connection(thd, 0); close_connection(thd, 0);