summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2011-01-07 17:28:06 -0200
committerDavi Arnaut <davi.arnaut@oracle.com>2011-01-07 17:28:06 -0200
commit4c810790f74deb9a3697accc12c2756bff4dad44 (patch)
tree94dc73910b959984185444daac93cf4302c96705 /mysys
parent78b6ca55cbc2ee278c953a00b0e5aa32511253a8 (diff)
downloadmariadb-git-4c810790f74deb9a3697accc12c2756bff4dad44.tar.gz
Bug#51023: Mysql server crashes on SIGHUP and destroys InnoDB files
WIN32 compilation fixes: define ETIMEDOUT only if not available and fix typos and add a missing parameter.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_fopen.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c
index a822b63dd63..b8373ecb3ab 100644
--- a/mysys/my_fopen.c
+++ b/mysys/my_fopen.c
@@ -103,17 +103,17 @@ FILE *my_fopen(const char *filename, int flags, myf MyFlags)
#if defined(_WIN32)
-static FILE *my_win_freopen(const char *path, FILE *stream)
+static FILE *my_win_freopen(const char *path, const char *mode, FILE *stream)
{
int handle_fd, fd= _fileno(stream);
HANDLE osfh;
- DBUG_ASSERT(filename && stream);
+ DBUG_ASSERT(path && stream);
/* Services don't have stdout/stderr on Windows, so _fileno returns -1. */
if (fd < 0)
{
- if (!freopen(filename, mode, stream))
+ if (!freopen(path, mode, stream))
return NULL;
fd= _fileno(stream);