diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-05-13 22:35:41 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-05-13 22:35:41 +0300 |
| commit | 6c60313bc71ac1dc2a507efcc63e99208e54f599 (patch) | |
| tree | eb19168363617d170092c63c546a6de8aac9df8c /include/my_global.h | |
| parent | 21b5aecff1435270754ccbc28bf6754fe5b6f9e3 (diff) | |
| parent | 1e99e9fe96ceefc2b137bcf114f43be5bb3ce336 (diff) | |
| download | mariadb-git-6c60313bc71ac1dc2a507efcc63e99208e54f599.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
include/my_global.h:
Auto merged
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 0cd1352a290..31375de30da 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -290,7 +290,6 @@ C_MODE_END /* This has to be after include limits.h */ #define HAVE_ERRNO_AS_DEFINE #define HAVE_FCNTL_LOCK -#undef HAVE_SYS_UN_H #undef HAVE_FINITE #undef HAVE_RINT #undef LONGLONG_MIN /* These get wrongly defined in QNX 6.2 */ |