diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-11-30 14:34:39 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-30 14:34:39 +0200 |
| commit | 3962da934f6e2a92ba04505bd6a33dd7d8322005 (patch) | |
| tree | c5510a774ac5e8722c26070e21e3d266d6408381 /sql-common/client.c | |
| parent | 13dad4ebd268e4bf26c4d6f478f19896770d9b78 (diff) | |
| parent | a95f54c6d81f20b07e41a7e0e2246ee00641df6c (diff) | |
| download | mariadb-git-3962da934f6e2a92ba04505bd6a33dd7d8322005.tar.gz | |
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw
Diffstat (limited to 'sql-common/client.c')
| -rw-r--r-- | sql-common/client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index cbed3a5e2a8..a4a2e518edf 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -389,7 +389,7 @@ HANDLE create_named_pipe(MYSQL *mysql, uint connect_timeout, char **arg_host, 0, NULL, OPEN_EXISTING, - 0, + FILE_FLAG_OVERLAPPED, NULL )) != INVALID_HANDLE_VALUE) break; if (GetLastError() != ERROR_PIPE_BUSY) @@ -623,7 +623,7 @@ HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout) err2: if (error_allow == 0) { - net->vio= vio_new_win32shared_memory(net,handle_file_map,handle_map, + net->vio= vio_new_win32shared_memory(handle_file_map,handle_map, event_server_wrote, event_server_read,event_client_wrote, event_client_read,event_conn_closed); @@ -2030,7 +2030,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, } else { - net->vio=vio_new_win32pipe(hPipe); + net->vio= vio_new_win32pipe(hPipe); my_snprintf(host_info=buff, sizeof(buff)-1, ER(CR_NAMEDPIPE_CONNECTION), unix_socket); } |