summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-03-03 23:07:20 +0100
committerunknown <serg@serg.mylan>2005-03-03 23:07:20 +0100
commit9210c01caca1053755476b35cf25d777ce3de7b5 (patch)
tree55707388340dadccc4056126d6e229f3d2c7791e /include
parent560968258f615959419102de6d86707545c69655 (diff)
parent9a420a4f7b5e8d375d405f45424ee7f40b55c357 (diff)
downloadmariadb-git-9210c01caca1053755476b35cf25d777ce3de7b5.tar.gz
merge
include/my_global.h: Auto merged mysys/mf_tempfile.c: Auto merged sql/ha_myisam.cc: Auto merged sql/share/english/errmsg.txt: Auto merged sql/table.cc: Auto merged
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 7ca3d5e1e58..23cf0d54824 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -523,6 +523,9 @@ typedef SOCKET_SIZE_TYPE size_socket;
#ifndef O_SHORT_LIVED
#define O_SHORT_LIVED 0
#endif
+#ifndef O_NOFOLLOW
+#define O_NOFOLLOW 0
+#endif
/* #define USE_RECORD_LOCK */