Commit 8c2360de authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

MDEV-17373 Windows: application verifier stop "Attempt to use an unknown SOCKET"

parent 7fefd53f
...@@ -735,7 +735,7 @@ inline_mysql_socket_send ...@@ -735,7 +735,7 @@ inline_mysql_socket_send
MYSQL_SOCKET mysql_socket, const SOCKBUF_T *buf, size_t n, int flags) MYSQL_SOCKET mysql_socket, const SOCKBUF_T *buf, size_t n, int flags)
{ {
ssize_t result; ssize_t result;
DBUG_ASSERT(mysql_socket.fd != INVALID_SOCKET);
#ifdef HAVE_PSI_SOCKET_INTERFACE #ifdef HAVE_PSI_SOCKET_INTERFACE
if (mysql_socket.m_psi != NULL) if (mysql_socket.m_psi != NULL)
{ {
...@@ -776,7 +776,7 @@ inline_mysql_socket_recv ...@@ -776,7 +776,7 @@ inline_mysql_socket_recv
MYSQL_SOCKET mysql_socket, SOCKBUF_T *buf, size_t n, int flags) MYSQL_SOCKET mysql_socket, SOCKBUF_T *buf, size_t n, int flags)
{ {
ssize_t result; ssize_t result;
DBUG_ASSERT(mysql_socket.fd != INVALID_SOCKET);
#ifdef HAVE_PSI_SOCKET_INTERFACE #ifdef HAVE_PSI_SOCKET_INTERFACE
if (mysql_socket.m_psi != NULL) if (mysql_socket.m_psi != NULL)
{ {
......
...@@ -12233,7 +12233,7 @@ static bool send_plugin_request_packet(MPVIO_EXT *mpvio, ...@@ -12233,7 +12233,7 @@ static bool send_plugin_request_packet(MPVIO_EXT *mpvio,
const char *client_auth_plugin= const char *client_auth_plugin=
((st_mysql_auth *) (plugin_decl(mpvio->plugin)->info))->client_auth_plugin; ((st_mysql_auth *) (plugin_decl(mpvio->plugin)->info))->client_auth_plugin;
DBUG_EXECUTE_IF("auth_disconnect", { vio_close(net->vio); DBUG_RETURN(1); }); DBUG_EXECUTE_IF("auth_disconnect", { DBUG_RETURN(1); });
DBUG_ASSERT(client_auth_plugin); DBUG_ASSERT(client_auth_plugin);
/* /*
......
...@@ -3224,7 +3224,7 @@ static void mysql_stmt_execute_common(THD *thd, ...@@ -3224,7 +3224,7 @@ static void mysql_stmt_execute_common(THD *thd,
sp_cache_enforce_limit(thd->sp_func_cache, stored_program_cache_size); sp_cache_enforce_limit(thd->sp_func_cache, stored_program_cache_size);
/* Close connection socket; for use with client testing (Bug#43560). */ /* Close connection socket; for use with client testing (Bug#43560). */
DBUG_EXECUTE_IF("close_conn_after_stmt_execute", vio_close(thd->net.vio);); DBUG_EXECUTE_IF("close_conn_after_stmt_execute", vio_shutdown(thd->net.vio,SHUT_RD););
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment