diff options
| author | unknown <wax@mysql.com> | 2004-12-23 14:44:21 +0500 |
|---|---|---|
| committer | unknown <wax@mysql.com> | 2004-12-23 14:44:21 +0500 |
| commit | 4e4b3db4df91cf62d1488d0d370687d69f28fee8 (patch) | |
| tree | 78717d3b2092219426f050aac2033a79f44148be /include | |
| parent | 7901cd306a6dcbb0863411ce68709f450e69d5aa (diff) | |
| parent | 79a0ed6232233f6c85c83fbee4e27e594a7149db (diff) | |
| download | mariadb-git-4e4b3db4df91cf62d1488d0d370687d69f28fee8.tar.gz | |
Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1smemory
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/violite.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/violite.h b/include/violite.h index ba7de3ee175..64e834d6653 100644 --- a/include/violite.h +++ b/include/violite.h @@ -45,7 +45,8 @@ Vio* vio_new_win32shared_memory(NET *net,HANDLE handle_file_map, HANDLE event_server_wrote, HANDLE event_server_read, HANDLE event_client_wrote, - HANDLE event_client_read); + HANDLE event_client_read, + HANDLE event_conn_closed); int vio_read_pipe(Vio *vio, gptr buf, int size); int vio_write_pipe(Vio *vio, const gptr buf, int size); int vio_close_pipe(Vio * vio); @@ -197,6 +198,7 @@ struct st_vio HANDLE event_server_read; HANDLE event_client_wrote; HANDLE event_client_read; + HANDLE event_conn_closed; long shared_memory_remain; char *shared_memory_pos; NET *net; |