From 16c4b3c68b06653592a9500050ad977a38f4ebae Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 9 Oct 2015 16:43:59 +0200
Subject: fixes for buildbot:

* OSX (mysqlimport freeing unallocated memory)
* Windows (didn't compile MSI)
* fulltest2 (innodb crashes in --embedded --big)
---
 win/packaging/ca/CustomAction.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'win')

diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp
index 17bfca1debb..3cb8520b65d 100644
--- a/win/packaging/ca/CustomAction.cpp
+++ b/win/packaging/ca/CustomAction.cpp
@@ -17,6 +17,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 #define UNICODE
 #endif
 
+#undef NOMINMAX
+
 #include <winsock2.h>
 #include <windows.h>
 #include <winreg.h>
-- 
cgit v1.2.1