diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
| commit | 2ca5b2c7916fe5312617aa992d5292e724af75f0 (patch) | |
| tree | 3fcae3d99a56ba99d825ae4457901d49e4b474e3 /sql-common | |
| parent | 7a90f041cc3b6db8600e9469cab6d436653552ec (diff) | |
| parent | 26fc5583196f7b88256cb733be033757a0517266 (diff) | |
| download | mariadb-git-2ca5b2c7916fe5312617aa992d5292e724af75f0.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql-common')
| -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 e483e72eb11..537a992e770 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -426,7 +426,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) @@ -660,7 +660,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); @@ -2405,7 +2405,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); } |