[Commits] Rev 3238: Always define UT_DBG_ABORT in innodb/xtradb, also on Windows. This will avoid endless hangs inside ut_dgb_stop_thread in file:///H:/bzr/5.5/

Vladislav Vaintroub wlad at montyprogram.com
Wed Jan 25 22:23:32 EET 2012


At file:///H:/bzr/5.5/

------------------------------------------------------------
revno: 3238
revision-id: wlad at montyprogram.com-20120125202314-dpe58dmc7hs6kwlo
parent: knielsen at knielsen-hq.org-20120125123954-ixortt1eq6bha6j3
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 5.5
timestamp: Wed 2012-01-25 21:23:14 +0100
message:
  Always define UT_DBG_ABORT in innodb/xtradb, also on Windows. This will avoid endless hangs inside ut_dgb_stop_thread
-------------- next part --------------
=== modified file 'storage/innobase/include/ut0dbg.h'
--- a/storage/innobase/include/ut0dbg.h	2011-04-06 06:22:36 +0000
+++ b/storage/innobase/include/ut0dbg.h	2012-01-25 20:23:14 +0000
@@ -55,11 +55,9 @@
 	ulint		line)	/*!< in: line number of the assertion */
 	UNIV_COLD __attribute__((nonnull(2)));
 
-#if defined(__WIN__) || defined(__INTEL_COMPILER)
-# undef UT_DBG_USE_ABORT
-#elif defined(__GNUC__) && (__GNUC__ > 2)
-# define UT_DBG_USE_ABORT
-#endif
+
+#define UT_DBG_USE_ABORT
+
 
 #ifndef UT_DBG_USE_ABORT
 /** A null pointer that will be dereferenced to trigger a memory trap */
@@ -83,7 +81,11 @@
 
 #ifdef UT_DBG_USE_ABORT
 /** Abort the execution. */
+#ifdef _WIN32
+# define UT_DBG_PANIC __debugbreak()
+#else
 # define UT_DBG_PANIC abort()
+#endif
 /** Stop threads (null operation) */
 # define UT_DBG_STOP do {} while (0)
 #else /* UT_DBG_USE_ABORT */

=== modified file 'storage/xtradb/include/ut0dbg.h'
--- a/storage/xtradb/include/ut0dbg.h	2011-07-14 19:22:41 +0000
+++ b/storage/xtradb/include/ut0dbg.h	2012-01-25 20:23:14 +0000
@@ -55,11 +55,9 @@
 	ulint		line)	/*!< in: line number of the assertion */
 	UNIV_COLD __attribute__((nonnull(2)));
 
-#if defined(__WIN__) || defined(__INTEL_COMPILER)
-# undef UT_DBG_USE_ABORT
-#elif defined(__GNUC__) && (__GNUC__ > 2)
-# define UT_DBG_USE_ABORT
-#endif
+
+#define UT_DBG_USE_ABORT
+
 
 #ifndef UT_DBG_USE_ABORT
 /** A null pointer that will be dereferenced to trigger a memory trap */
@@ -83,7 +81,11 @@
 
 #ifdef UT_DBG_USE_ABORT
 /** Abort the execution. */
+#ifdef _WIN32
+# define UT_DBG_PANIC __debugbreak()
+#else
 # define UT_DBG_PANIC abort()
+#endif
 /** Stop threads (null operation) */
 # define UT_DBG_STOP do {} while (0)
 #else /* UT_DBG_USE_ABORT */



More information about the commits mailing list