summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>2012-02-17 19:02:17 +0000
committerTatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>2012-02-17 19:02:17 +0000
commitda2cc0cdf6ea9b1e689f41307ec118cf05579fc7 (patch)
treeb79a216e0f89da10e47a28ebeda751d7714a878b /include
parentad72fff9b0efcd772be1fed6fde5e8e357a5f58e (diff)
downloadmariadb-git-da2cc0cdf6ea9b1e689f41307ec118cf05579fc7.tar.gz
BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON WINDOWS
On shutdown(), Windows can drop traffic still queued for sending even if that wasn't specifically requested. As a result, fatal errors (those after signaling which the server will drop the connection) were sometimes only seen as "connection lost" on the client side, because the server-side shutdown() erraneously discarded the correct error message before sending it. If on Windows, we now use the Windows API to access the (non-broken) equivalent of shutdown(). Backport from trunk
Diffstat (limited to 'include')
-rw-r--r--include/violite.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/violite.h b/include/violite.h
index 32354938e13..5facd0911b7 100644
--- a/include/violite.h
+++ b/include/violite.h
@@ -61,6 +61,9 @@ int vio_close_pipe(Vio * vio);
#define HANDLE void *
#endif /* __WIN__ */
+/* backport from 5.6 where it is part of PSI, not vio_*() */
+int mysql_socket_shutdown(my_socket mysql_socket, int how);
+
void vio_delete(Vio* vio);
int vio_close(Vio* vio);
void vio_reset(Vio* vio, enum enum_vio_type type,