diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-02 12:01:24 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-02 12:01:24 +0300 |
| commit | e0a6b02c5d0a311e7167295494786077009743d1 (patch) | |
| tree | 72c934fe42261ad5de3139961e092f57e9d147df /include/my_global.h | |
| parent | d2f8b7d04503478ab6b6998194a2070891f0c2bb (diff) | |
| parent | 6ad06b15222300e4eed4fe3972d1ad249c4c42a2 (diff) | |
| download | mariadb-git-e0a6b02c5d0a311e7167295494786077009743d1.tar.gz | |
Merge with MySQL 5.1.49
Fixed Bug#52005 'JOIN_TAB->dependent' may be incorrectly propageted for multilevel outer joins' in a better way (patch from Sergey Petrunya)
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 9d9daf5aa1a..b4579248dfa 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -55,6 +55,10 @@ #define USE_PRAGMA_INTERFACE #endif +#if defined(__OpenBSD__) && (OpenBSD >= 200411) +#define HAVE_ERRNO_AS_DEFINE +#endif + #if defined(i386) && !defined(__i386__) #define __i386__ #endif @@ -548,8 +552,8 @@ extern "C" int madvise(void *addr, size_t len, int behav); #endif /* Does the system remember a signal handler after a signal ? */ -#ifndef HAVE_BSD_SIGNALS -#define DONT_REMEMBER_SIGNAL +#if !defined(HAVE_BSD_SIGNALS) && !defined(HAVE_SIGACTION) +#define SIGNAL_HANDLER_RESET_ON_DELIVERY #endif /* Define void to stop lint from generating "null effekt" comments */ |