diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-09 09:11:30 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-09 09:11:30 +0300 |
| commit | 43ee6915fa4b8e3088e89b7d4325946190ce04f5 (patch) | |
| tree | e580d22b0ff6faed1720f88ddeedf86a0867fa41 /include | |
| parent | 7d4beb7286d53be07ff552de9d37ea90c2762651 (diff) | |
| parent | 1ebe841fb85725c2a6aaecb3bca41ec098a5193d (diff) | |
| download | mariadb-git-43ee6915fa4b8e3088e89b7d4325946190ce04f5.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/psi/mysql_socket.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h index b8854edbfd0..2076f8cc999 100644 --- a/include/mysql/psi/mysql_socket.h +++ b/include/mysql/psi/mysql_socket.h @@ -735,7 +735,7 @@ inline_mysql_socket_send MYSQL_SOCKET mysql_socket, const SOCKBUF_T *buf, size_t n, int flags) { ssize_t result; - + DBUG_ASSERT(mysql_socket.fd != INVALID_SOCKET); #ifdef HAVE_PSI_SOCKET_INTERFACE if (psi_likely(mysql_socket.m_psi != NULL)) { @@ -776,7 +776,7 @@ inline_mysql_socket_recv MYSQL_SOCKET mysql_socket, SOCKBUF_T *buf, size_t n, int flags) { ssize_t result; - + DBUG_ASSERT(mysql_socket.fd != INVALID_SOCKET); #ifdef HAVE_PSI_SOCKET_INTERFACE if (psi_likely(mysql_socket.m_psi != NULL)) { |