diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-27 14:42:12 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-27 14:42:12 +0400 |
| commit | 7779b9830cf9aa08a11c8a8340407475a027ac22 (patch) | |
| tree | ad1ade4c08ab71afbaee51c4b337e8f67e3df6bf /include | |
| parent | a2e7f632cfb30dcf7338dbb78bb19f94d4201323 (diff) | |
| parent | 4c31276e6642c1e4c200da030d77746a5a386ff2 (diff) | |
| download | mariadb-git-7779b9830cf9aa08a11c8a8340407475a027ac22.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Null-merged patch for bug 53907.
Conflicts:
conflict sql/sql_parse.cc
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 6558e402586..6246bde0cbc 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -60,6 +60,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 |