diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2022-09-07 15:28:58 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2022-09-07 15:28:58 +0200 |
| commit | 80cf7a4c43209a91ac6514ac3ea0dd0b592e17f0 (patch) | |
| tree | 05d71896fa07dce6ad23ff55b7065af58c29d4ef /sql/threadpool_common.cc | |
| parent | dd092bc6ebb23a6a93da284bc81175f2e0c54896 (diff) | |
| parent | 9a8faeea142ea6f575419799c9439f4673971573 (diff) | |
| download | mariadb-git-80cf7a4c43209a91ac6514ac3ea0dd0b592e17f0.tar.gz | |
Merge branch '10.4' into 10.5
# Conflicts:
# sql/sql_connect.cc
Diffstat (limited to 'sql/threadpool_common.cc')
| -rw-r--r-- | sql/threadpool_common.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc index 088c97ddb99..c4ab9697f8e 100644 --- a/sql/threadpool_common.cc +++ b/sql/threadpool_common.cc @@ -224,14 +224,6 @@ 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. |