diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-10-05 09:36:02 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-10-05 09:36:02 +0100 |
| commit | 98473a83997469a3c198c6cad9c48f7a9d82887d (patch) | |
| tree | 8b088bfcc2b4888aa00b2dcbd8d35f86b6c108e5 | |
| parent | 8f329e8d37e08c28d4e39d5c87ea22300285d9cd (diff) | |
| download | mariadb-git-98473a83997469a3c198c6cad9c48f7a9d82887d.tar.gz | |
Small refactoring in vio.
- remove function prototype for shared memory (no more used), and VIO
members that are unused
- Do not call DisconnectNamedPipe on pipe handle. CloseHandle() is enough.
| -rw-r--r-- | include/violite.h | 9 | ||||
| -rw-r--r-- | vio/viopipe.c | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/include/violite.h b/include/violite.h index 4d75d7435b9..74b53f41fdd 100644 --- a/include/violite.h +++ b/include/violite.h @@ -68,13 +68,6 @@ Vio* vio_new(my_socket sd, enum enum_vio_type type, uint flags); Vio* mysql_socket_vio_new(MYSQL_SOCKET mysql_socket, enum enum_vio_type type, uint flags); #ifdef __WIN__ Vio* vio_new_win32pipe(HANDLE hPipe); -Vio* vio_new_win32shared_memory(HANDLE handle_file_map, - HANDLE handle_map, - HANDLE event_server_wrote, - HANDLE event_server_read, - HANDLE event_client_wrote, - HANDLE event_client_read, - HANDLE event_conn_closed); #else #define HANDLE void * #endif /* __WIN__ */ @@ -268,8 +261,6 @@ struct st_vio #ifdef _WIN32 HANDLE hPipe; OVERLAPPED overlapped; - DWORD read_timeout_ms; - DWORD write_timeout_ms; #endif }; #endif /* vio_violite_h_ */ diff --git a/vio/viopipe.c b/vio/viopipe.c index d3447a95c6e..0a3deb91262 100644 --- a/vio/viopipe.c +++ b/vio/viopipe.c @@ -131,7 +131,6 @@ int vio_close_pipe(Vio *vio) CancelIo(vio->hPipe); CloseHandle(vio->overlapped.hEvent); - DisconnectNamedPipe(vio->hPipe); ret= CloseHandle(vio->hPipe); vio->type= VIO_CLOSED; |