Fix assertion failure seen on Buildbot win32-debug

Jan Lindström · Jan Lindström · commit 2bdbfd334bba · 2015-03-18T12:18:39.000+02:00
There is a bug in Visual Studio 2010
Visual Studio has a feature "Checked Iterators". In a debug build, every
iterator operation is checked at runtime for errors, e g, out of range.
Disable this "Checked Iterators" for Windows and Debug if defined.
diff --git a/storage/innobase/sync/sync0sync.cc b/storage/innobase/sync/sync0sync.cc
@@ -47,6 +47,19 @@ Created 9/5/1995 Heikki Tuuri
 #include "ha_prototypes.h"
 #include "my_cpu.h"
 
+/* There is a bug in Visual Studio 2010
+Visual Studio has a feature "Checked Iterators". In a debug build, every
+iterator operation is checked at runtime for errors, e g, out of range.
+Disable this "Checked Iterators" for Windows and Debug if defined.
+*/
+#ifdef UNIV_DEBUG
+#ifdef __WIN__
+#ifdef _ITERATOR_DEBUG_LEVEL
+#define _ITERATOR_DEBUG_LEVEL 0
+#endif /* _ITERATOR_DEBUG_LEVEL */
+#endif /* __WIN__*/
+#endif /* UNIV_DEBUG */
+
 #include <vector>
 
 /*
diff --git a/storage/xtradb/sync/sync0sync.cc b/storage/xtradb/sync/sync0sync.cc
@@ -48,6 +48,19 @@ Created 9/5/1995 Heikki Tuuri
 #include "ha_prototypes.h"
 #include "my_cpu.h"
 
+/* There is a bug in Visual Studio 2010
+Visual Studio has a feature "Checked Iterators". In a debug build, every
+iterator operation is checked at runtime for errors, e g, out of range.
+Disable this "Checked Iterators" for Windows and Debug if defined.
+*/
+#ifdef UNIV_DEBUG
+#ifdef __WIN__
+#ifdef _ITERATOR_DEBUG_LEVEL
+#define _ITERATOR_DEBUG_LEVEL 0
+#endif /* _ITERATOR_DEBUG_LEVEL */
+#endif /* __WIN__*/
+#endif /* UNIV_DEBUG */
+
 #include <vector>
 
 /*
