diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2022-09-07 13:49:49 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2022-09-07 13:49:49 +0200 |
| commit | 9a8faeea142ea6f575419799c9439f4673971573 (patch) | |
| tree | 6de23bf540987b39f62f0d07f6302d389a7ddffa /sql/sql_connect.cc | |
| parent | c7ba2377936be2a3c84080359d87f7486ce682a0 (diff) | |
| download | mariadb-git-9a8faeea142ea6f575419799c9439f4673971573.tar.gz | |
MDEV-18353 - minor cleanup
Do not repeat yourself.
Instead of having the same DBUG_EXECUTE_IF code in threadpool and
thread-per-connection, add this code to setup_connection_thread_globals()
which is executed in all scheduling modes.
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 733d281efd5..17beb413e7f 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -1107,6 +1107,14 @@ static int check_connection(THD *thd) bool 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); + }); + if (thd->store_globals()) { close_connection(thd, ER_OUT_OF_RESOURCES); @@ -1360,14 +1368,6 @@ void do_handle_one_connection(CONNECT *connect) 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: increment slow_launch_threads counter if it took more than |