summaryrefslogtreecommitdiff
path: root/include
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
commit844d6ed4b26e676418eb3867682fc1a2949e4706 (patch)
tree94dc73910b959984185444daac93cf4302c96705 /include
parent998065c3a6f3d65e88c3926b31088a245f77406d (diff)
downloadmariadb-git-844d6ed4b26e676418eb3867682fc1a2949e4706.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 'include')
-rw-r--r--include/my_pthread.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index a7e4ea25064..3880511da2d 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -126,7 +126,9 @@ struct tm *gmtime_r(const time_t *timep,struct tm *tmp);
void pthread_exit(void *a); /* was #define pthread_exit(A) ExitThread(A)*/
-#define ETIMEDOUT 145 /* Win32 doesn't have this */
+#ifndef ETIMEDOUT
+#define ETIMEDOUT 145 /* Win32 might not have this */
+#endif
#define getpid() GetCurrentThreadId()
#define HAVE_LOCALTIME_R 1
#define _REENTRANT 1