diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-25 21:23:14 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-25 21:23:14 +0100 |
| commit | 7ffa6f4d06370aa0d8de24e8a55b30c86ca7c595 (patch) | |
| tree | e4f208e6eab6b913b93d8126e1aeb265704c30f6 /storage/xtradb | |
| parent | cff7a9861a32c82ef51d18f42a09337399257db7 (diff) | |
| download | mariadb-git-7ffa6f4d06370aa0d8de24e8a55b30c86ca7c595.tar.gz | |
Always define UT_DBG_ABORT in innodb/xtradb, also on Windows. This will avoid endless hangs inside ut_dgb_stop_thread
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/include/ut0dbg.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/storage/xtradb/include/ut0dbg.h b/storage/xtradb/include/ut0dbg.h index 07730176d81..ce6dcb63049 100644 --- a/storage/xtradb/include/ut0dbg.h +++ b/storage/xtradb/include/ut0dbg.h @@ -55,11 +55,9 @@ ut_dbg_assertion_failed( 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 @@ ut_dbg_stop_thread( #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 */ |