diff options
| author | unknown <ingo@mysql.com> | 2005-03-04 11:37:45 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-03-04 11:37:45 +0100 |
| commit | 7bd7643ab7b1df5de942422ef0a037718881b3b3 (patch) | |
| tree | be5541209e5f5e84db880427fffd18b0e7e9ceb8 /include/my_global.h | |
| parent | aec0408ba9634bc15be77b8507ca8b83ff609e24 (diff) | |
| parent | e54b545a966a92677242d6e6f904a10eb73cb707 (diff) | |
| download | mariadb-git-7bd7643ab7b1df5de942422ef0a037718881b3b3.tar.gz | |
Merge with after merge fix
BitKeeper/deleted/.del-create.c~96cecc433c0c2242:
Auto merged
include/my_global.h:
Auto merged
myisam/mi_create.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
Auto merged
BitKeeper/deleted/.del-mrg_create.c~b747c8ec2b801f6:
Auto merged
sql/table.cc:
Auto merged
sql/sql_udf.cc:
After merge fix
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 30b98b9fbeb..e9470ac48aa 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 */ |