Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria

into  mysqlwin32.:C:/mysql-maria

include/my_dbug.h

@@ -87,7 +87,20 @@ extern  void _db_flush_();
 #define DEBUGGER_OFF                    do { _dbug_on_= 0; } while(0)
 #define DEBUGGER_ON                     do { _dbug_on_= 1; } while(0)
 #define IF_DBUG(A) A
+#ifndef __WIN__
 #define DBUG_ABORT()                    (_db_flush_(), abort())
+#else
+/*
+  Avoid popup with abort/retry/ignore buttons. When BUG#31745 is fixed we can
+  call abort() instead of _exit(3) (now it would cause a "test signal" popup).
+*/
+#include <crtdbg.h>
+#define DBUG_ABORT() (_db_flush_(),\
+                     (void)_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE),\
+                     (void)_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR),\
+                     _exit(3))
+#endif
+
 #else                                           /* No debugger */
 
 #define DBUG_ENTER(a1)

mysys/my_thr_init.c

@@ -444,18 +444,3 @@ static uint get_thread_lib(void)
 }
 
 #endif /* THREAD */
-
-
-#ifdef __WIN__
-/*
-  With Windows debug builds abort() causes a popup from CRT; as abort()
-  is used in tests it is annoying so we use a custom one.
-*/
-void abort(void)
-{
-#ifdef REENABLE_AFTER_FIX_FOR_BUG_31745 /* don't want a popup */
-  raise(SIGABRT);
-#endif
-  _exit(3);
-}
-#endif