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

Merge branch '10.4' into 10.5

Browse Source 
# Conflicts:
#	sql/sql_connect.cc
This commit is contained in:
Vladislav Vaintroub
2022-09-07 15:28:58 +02:00
parent dd092bc6eb 9a8faeea14
commit 80cf7a4c43
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_connect.cc
View File

@ -1108,6 +1108,12 @@ static int check_connection(THD *thd)
void setup_connection_thread_globals(THD *thd) void setup_connection_thread_globals(THD *thd)
{ {
DBUG_EXECUTE_IF("CONNECT_wait", {
extern MYSQL_SOCKET unix_sock;
DBUG_ASSERT(unix_sock.fd >= 0);
while (unix_sock.fd >= 0)
my_sleep(1000);
});
thd->store_globals(); thd->store_globals();
} }
@ -1359,14 +1365,6 @@ void do_handle_one_connection(CONNECT *connect, bool put_in_cache)
return; return;
} }
DBUG_EXECUTE_IF("CONNECT_wait",
{
extern MYSQL_SOCKET unix_sock;
DBUG_ASSERT(unix_sock.fd >= 0);
while (unix_sock.fd >= 0)
my_sleep(1000);
});
/* /*
If a thread was created to handle this connection: If a thread was created to handle this connection:
increment slow_launch_threads counter if it took more than increment slow_launch_threads counter if it took more than

8
sql/threadpool_common.cc
View File

@ -224,14 +224,6 @@ static THD* threadpool_add_connection(CONNECT *connect, void *scheduler_data)
{ {
THD *thd= NULL; 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 Create a new connection context: mysys_thread_var and PSI thread
Store them in THD. Store them in THD.