diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-10-09 16:43:59 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-09 16:43:59 +0200 |
commit | 16c4b3c68b06653592a9500050ad977a38f4ebae (patch) | |
tree | 9c26da00fe119d92efd3792987c3790d7d0fb409 /win | |
parent | f41a41fd912af97bc2703d3fcec8d1a294bef023 (diff) | |
download | mariadb-git-16c4b3c68b06653592a9500050ad977a38f4ebae.tar.gz |
fixes for buildbot:mariadb-5.5.46
* OSX (mysqlimport freeing unallocated memory)
* Windows (didn't compile MSI)
* fulltest2 (innodb crashes in --embedded --big)
Diffstat (limited to 'win')
-rw-r--r-- | win/packaging/ca/CustomAction.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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> |