diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-16 21:49:51 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-16 21:49:51 +0100 |
| commit | a962160eec233c265900e2754ed2a63ef5e27c5a (patch) | |
| tree | f1b33a7aed53016189b17cd3f50243b3c8a022de /include/violite.h | |
| parent | 166e0683c0d45a79716d8913ec9ecaf3177343fa (diff) | |
| parent | 9b7a7f06c1a56f49a4528f019ec821d3a01934b6 (diff) | |
| download | mariadb-git-a962160eec233c265900e2754ed2a63ef5e27c5a.tar.gz | |
Merge with MySQL 5.1, with following additions:
- Moved some code from innodb_plugin to xtradb, to ensure that all tests runs
- Did changes in pbxt and maria storage engines becasue of changes in thd->query
- Reverted wrong code in sql_table.cc for how ROW_FORMAT is used.
This is a re-commit of Monty's merge to eliminate an extra commit from
MySQL-5.1.42 that was accidentally included in the merge.
This is a merge of the MySQL 5.1.41 clone-off (clone-5.1.41-build). In
case there are any extra changes done before final MySQL 5.1.41
release, these will need to be merged later before MariaDB 5.1.41
release.
Diffstat (limited to 'include/violite.h')
| -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 7f017635f31..9d104a0b23f 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, @@ -222,7 +222,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_ */ |