summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-05-27 14:42:12 +0400
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-05-27 14:42:12 +0400
commit17325b8d6788cfd6f8ff158a6e7e11c7ab9f008e (patch)
treead1ade4c08ab71afbaee51c4b337e8f67e3df6bf /include/my_global.h
parentb19c880522ebc4ba232373d48be67a49fa921286 (diff)
parent54a006fa0f33147b61a309a28e9ee0e3742f829c (diff)
downloadmariadb-git-17325b8d6788cfd6f8ff158a6e7e11c7ab9f008e.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/my_global.h')
-rw-r--r--include/my_global.h4
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