summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 5f3f31261d4..fa10d4af3a1 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1209,12 +1209,9 @@ PSI_statement_info stmt_info_new_packet;
#endif
#ifndef EMBEDDED_LIBRARY
-void net_before_header_psi(struct st_net *net, void *user_data, size_t /* unused: count */)
+void net_before_header_psi(struct st_net *net, void *thd, size_t /* unused: count */)
{
- THD *thd;
- thd= static_cast<THD*> (user_data);
- DBUG_ASSERT(thd != NULL);
-
+ DBUG_ASSERT(thd);
/*
We only come where when the server is IDLE, waiting for the next command.
Technically, it is a wait on a socket, which may take a long time,
@@ -1223,7 +1220,8 @@ void net_before_header_psi(struct st_net *net, void *user_data, size_t /* unused
Instead, start explicitly an IDLE event.
*/
MYSQL_SOCKET_SET_STATE(net->vio->mysql_socket, PSI_SOCKET_STATE_IDLE);
- MYSQL_START_IDLE_WAIT(thd->m_idle_psi, &thd->m_idle_state);
+ MYSQL_START_IDLE_WAIT(static_cast<THD*>(thd)->m_idle_psi,
+ &static_cast<THD*>(thd)->m_idle_state);
}
void net_after_header_psi(struct st_net *net, void *user_data,