Fixes for running maria-recovery*.test and maria-purge.test under

Windows.


include/my_dbug.h:
  a DBUG expression to force a flush of the trace file then an abort of the process
mysql-test/include/wait_until_connected_again.inc:
  mysqladmin waits for pid file to be gone only under Unix; so
  maria_empty_logs.inc cannot wait for mysqld to be gone, so
  wait_until_connected_again.inc may send its "show status" to a 
  not-yet-dead server hence the 1053 error ("server shutdown in progress")
mysys/my_thr_init.c:
  overload abort() under Windows, to not have an annoying CRT popup
  ("ignore/abort/retry" buttons) each time a test intentionally
  crashes mysqld
sql/handler.cc:
  use new expression
sql/log.cc:
  use new expression
sql/mysql_priv.h:
  use new expression
storage/maria/ha_maria.cc:
  use new expression
storage/maria/ma_blockrec.c:
  use new expression
storage/maria/ma_check.c:
  use new expression
storage/maria/ma_checkpoint.c:
  use new expression
storage/maria/ma_control_file.c:
  Can't yet lock control file under Windows (test suite problems,
  plus concerns about stray lock preventing a fast restart after crash).
storage/maria/ma_loghandler.c:
  A file which should be closed, otherwise translog_purge() (the caller)
  cannot delete logs.

1 files changed, 15 insertions, 0 deletions

diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c
index aadb86d39ed..f4c7f607a45 100644
--- a/mysys/my_thr_init.c
+++ b/mysys/my_thr_init.c
@@ -444,3 +444,18 @@ 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