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

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-07-31 23:19:51 +02:00
parent a49f5525bb 7841a7eb09
commit ae6bdc6769
345 changed files with 7745 additions and 2127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/threadpool_common.cc
View File

@ -224,6 +224,14 @@ static THD* threadpool_add_connection(CONNECT *connect, void *scheduler_data)
{
THD *thd= NULL;
DBUG_EXECUTE_IF("CONNECT_wait",
{
extern MYSQL_SOCKET unix_sock;
DBUG_ASSERT(unix_sock.fd >= 0);
while (unix_sock.fd >= 0)
my_sleep(1000);
});
/*
Create a new connection context: mysys_thread_var and PSI thread
Store them in THD.
@ -241,10 +249,9 @@ static THD* threadpool_add_connection(CONNECT *connect, void *scheduler_data)
my_thread_end();
return NULL;
}
delete connect;
thd->event_scheduler.data = scheduler_data;
server_threads.insert(thd);
server_threads.insert(thd); // Make THD visible in show processlist
delete connect; // must be after server_threads.insert, see close_connections()
thd->set_mysys_var(mysys_var);