summaryrefslogtreecommitdiff
path: root/mysys/my_lock.c
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-11-28 04:47:47 +0200
committermonty@donna.mysql.com <>2000-11-28 04:47:47 +0200
commit74e7ffe9872e74f3ac1ae4e93a2ef1b0d2c97c03 (patch)
treee3d40dd7c6a7e86bd2388da19d59d5a372bf7bb8 /mysys/my_lock.c
parentad2e43c7d6f4b7bbe5b92830ef11856c7d18b6b5 (diff)
downloadmariadb-git-74e7ffe9872e74f3ac1ae4e93a2ef1b0d2c97c03.tar.gz
New thr_alarm struct for better integration with OS2
Run bootstrap in separate thread Fix bug in FLUSH TABLES table_name
Diffstat (limited to 'mysys/my_lock.c')
-rw-r--r--mysys/my_lock.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/my_lock.c b/mysys/my_lock.c
index ed637648353..6486e07834b 100644
--- a/mysys/my_lock.c
+++ b/mysys/my_lock.c
@@ -33,9 +33,11 @@
#include <os2emx.h>
#endif
+#ifndef __EMX__
#ifdef HAVE_FCNTL
static struct flock lock; /* Must be static for sun-sparc */
#endif
+#endif
/* Lock a part of a file */