diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-05 12:14:01 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-05 12:14:01 +0300 |
| commit | 8b78a6af010204b885c9b196dc395baade5346ba (patch) | |
| tree | 1cc53ffef1577dee87351c8fd775409dc216b736 /include | |
| parent | 39822f2367c351e6d0eaecfc37b5728692ecce21 (diff) | |
| parent | 2f075a1e37a483833e6f7e2de4bd3f9b1848082c (diff) | |
| download | mariadb-git-8b78a6af010204b885c9b196dc395baade5346ba.tar.gz | |
Auto-merge from mysql-5.1.
Diffstat (limited to 'include')
| -rw-r--r-- | include/violite.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/violite.h b/include/violite.h index f833606233c..3f68ccde10f 100644 --- a/include/violite.h +++ b/include/violite.h @@ -44,7 +44,7 @@ enum enum_vio_type Vio* vio_new(my_socket sd, enum enum_vio_type type, uint flags); #ifdef __WIN__ Vio* vio_new_win32pipe(HANDLE hPipe); -Vio* vio_new_win32shared_memory(NET *net,HANDLE handle_file_map, +Vio* vio_new_win32shared_memory(HANDLE handle_file_map, HANDLE handle_map, HANDLE event_server_wrote, HANDLE event_server_read, @@ -221,7 +221,11 @@ struct st_vio HANDLE event_conn_closed; size_t shared_memory_remain; char *shared_memory_pos; - NET *net; #endif /* HAVE_SMEM */ +#ifdef _WIN32 + OVERLAPPED pipe_overlapped; + DWORD read_timeout_millis; + DWORD write_timeout_millis; +#endif }; #endif /* vio_violite_h_ */ |