diff options
author | monty@mashka.mysql.fi <> | 2002-07-25 22:46:28 +0300 |
---|---|---|
committer | monty@mashka.mysql.fi <> | 2002-07-25 22:46:28 +0300 |
commit | bc035c71f1d94649253e4dac5fb8e5c981c7d834 (patch) | |
tree | f38c137c73206e3d059517b2bcab6a4a43c957f9 /include/config-os2.h | |
parent | b126501bf3888b09fad83dbd2894709c45f009fc (diff) | |
parent | 3c9f1a9ae47e4fcbede526430b0171e8ba17d948 (diff) | |
download | mariadb-git-bc035c71f1d94649253e4dac5fb8e5c981c7d834.tar.gz |
Merge with 3.23.51
Fixed wrong usage of sprintf() in ha_innodb.cc
Diffstat (limited to 'include/config-os2.h')
-rw-r--r-- | include/config-os2.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/config-os2.h b/include/config-os2.h index 2554cfd8495..7e9684ae3f5 100644 --- a/include/config-os2.h +++ b/include/config-os2.h @@ -26,6 +26,7 @@ #include <os2.h> #include <math.h> #include <io.h> +#include <types.h> /* Define to name of system eg solaris*/ #define SYSTEM_TYPE "IBM OS/2 Warp" @@ -55,6 +56,8 @@ #define FILE_BINARY O_BINARY /* my_fopen in binary mode */ #define S_IROTH S_IREAD /* for my_lib */ +#define CANT_DELETE_OPEN_FILES /* saves open files in a list, for delayed delete */ + #define O_NONBLOCK 0x10 #define NO_OPEN_3 /* For my_create() */ @@ -84,7 +87,7 @@ #define F_WRLCK 2 /* Write lock. */ #define F_UNLCK 0 /* Remove lock. */ -#define S_IFMT 0xF000 /* Mask for file type */ +#define S_IFMT 0x17000 /* Mask for file type */ #define F_TO_EOF 0L /* Param to lockf() to lock rest of file */ #define HUGE_PTR @@ -268,7 +271,7 @@ typedef unsigned long long os_off_t; /* #undef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT */ /* READLINE: */ -#define HAVE_POSIX_SIGNALS 1 +#define HAVE_POSIX_SIGNALS 0 /* sigwait with one argument */ /* #undef HAVE_NONPOSIX_SIGWAIT */ |