Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
8c2360de
Commit
8c2360de
authored
Oct 04, 2018
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-17373 Windows: application verifier stop "Attempt to use an unknown SOCKET"
parent
7fefd53f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
include/mysql/psi/mysql_socket.h
include/mysql/psi/mysql_socket.h
+2
-2
sql/sql_acl.cc
sql/sql_acl.cc
+1
-1
sql/sql_prepare.cc
sql/sql_prepare.cc
+1
-1
No files found.
include/mysql/psi/mysql_socket.h
View file @
8c2360de
...
@@ -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
)
{
{
...
...
sql/sql_acl.cc
View file @
8c2360de
...
@@ -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
);
/*
/*
...
...
sql/sql_prepare.cc
View file @
8c2360de
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment