summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2011-11-30 17:11:13 +0100
committerTor Didriksen <tor.didriksen@oracle.com>2011-11-30 17:11:13 +0100
commit23dce762a45c634cafaeef73fefd34c0ee2f096f (patch)
tree27d9a368a46d6cd35185127206982b89ab0794ac /sql
parent9a15f2492b1bccfa085a19c252ed5224c1fde3b2 (diff)
downloadmariadb-git-23dce762a45c634cafaeef73fefd34c0ee2f096f.tar.gz
Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS
Post-push fix: build break on windows/optimized
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 73b107e4746..c47d39721b9 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -122,6 +122,10 @@ extern "C" { // Because of SCO 3.2V4.2
#include <sys/mman.h>
#endif
+#ifdef __WIN__
+#include <crtdbg.h>
+#endif
+
#ifdef __NETWARE__
#define zVOLSTATE_ACTIVE 6
#define zVOLSTATE_DEACTIVE 2