summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>2012-02-22 16:18:12 +0100
committerTatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>2012-02-22 16:18:12 +0100
commit0f64bd26bbdc86d317d13f79aff5871b354ca9c0 (patch)
treee79c837378ec12d7fcc9a89502df96e7860bd1c2 /include
parentf3eb021d5e0c09215b28bf82c10b2e3085ad7a38 (diff)
parenta775a1844e89d7400375400caf3ca1c0e7f865ed (diff)
downloadmariadb-git-0f64bd26bbdc86d317d13f79aff5871b354ca9c0.tar.gz
auto-merge
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,