diff options
author | Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> | 2012-02-22 16:18:12 +0100 |
---|---|---|
committer | Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> | 2012-02-22 16:18:12 +0100 |
commit | eca61722b0674be62a7265eb55e10d5c98515efd (patch) | |
tree | e79c837378ec12d7fcc9a89502df96e7860bd1c2 /include | |
parent | 067f83e642f472ccae31b593fead20d7588f681a (diff) | |
parent | 108445549bf0f9428ae714cfe41266f34adf12f8 (diff) | |
download | mariadb-git-eca61722b0674be62a7265eb55e10d5c98515efd.tar.gz |
auto-merge
Diffstat (limited to 'include')
-rw-r--r-- | include/violite.h | 3 |
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, |