diff options
author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-11-24 11:31:36 +0300 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-11-24 11:31:36 +0300 |
commit | adb89e98aaa8b00b3efb7a56aebdaf12c5e75ee4 (patch) | |
tree | c7017f926485e3c5647276d684f4adc4847f9faf /include | |
parent | bc014badaf78cd057018a7db6a9857b584b932b3 (diff) | |
parent | fad34c34cf22eb1c503204aee204dfb83ad7acea (diff) | |
download | mariadb-git-adb89e98aaa8b00b3efb7a56aebdaf12c5e75ee4.tar.gz |
Manual merge from the mysql-5.1-bugteam.
Diffstat (limited to 'include')
-rw-r--r-- | include/violite.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/violite.h b/include/violite.h index 3f68ccde10f..1eef3ef5730 100644 --- a/include/violite.h +++ b/include/violite.h @@ -224,8 +224,8 @@ struct st_vio #endif /* HAVE_SMEM */ #ifdef _WIN32 OVERLAPPED pipe_overlapped; - DWORD read_timeout_millis; - DWORD write_timeout_millis; + DWORD read_timeout_ms; + DWORD write_timeout_ms; #endif }; #endif /* vio_violite_h_ */ |