Fix some failing tests on Windows

- ensure that mtr supressions table is flushed before doing controlled crash and restart
- use DBUG_SUICIDE() rather than abort() in partition tests - avoids a crash message/warning
- disable  perfschema all_instances test on Windows- there are  legitimate reasons  for output to be different on  Unix (some different threads, some different locks), the differences are expected to grow in the future, e.g with threadpool.

10 files changed, 12 insertions, 9 deletions

diff --git a/mysql-test/suite/innodb/r/innodb_bug59641.result b/mysql-test/suite/innodb/r/innodb_bug59641.result
index e44fe1d69b4..c94c2105e98 100644
--- a/mysql-test/suite/innodb/r/innodb_bug59641.result
+++ b/mysql-test/suite/innodb/r/innodb_bug59641.result
@@ -1,3 +1,4 @@
+call mtr.add_suppression("Found 3 prepared XA transactions");
 FLUSH TABLES;
 CREATE TABLE t(a INT PRIMARY KEY, b INT)ENGINE=InnoDB;
 INSERT INTO t VALUES(2,2),(4,4),(8,8),(16,16),(32,32);
@@ -15,7 +16,6 @@ XA START '789';
 UPDATE t SET b=4*a WHERE a=32;
 XA END '789';
 XA PREPARE '789';
-call mtr.add_suppression("Found 3 prepared XA transactions");
 SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 SELECT * FROM t;
 a	b
diff --git a/mysql-test/suite/innodb/t/innodb_bug59641.test b/mysql-test/suite/innodb/t/innodb_bug59641.test
index 633f917692f..bf9845b8e6f 100644
--- a/mysql-test/suite/innodb/t/innodb_bug59641.test
+++ b/mysql-test/suite/innodb/t/innodb_bug59641.test
@@ -1,7 +1,8 @@
 # Bug #59641 Prepared XA transaction causes shutdown hang after a crash
 
 -- source include/not_embedded.inc
-
+# The server would issue this warning on restart.
+call mtr.add_suppression("Found 3 prepared XA transactions");
 FLUSH TABLES;
 
 CREATE TABLE t(a INT PRIMARY KEY, b INT)ENGINE=InnoDB;
@@ -31,8 +32,6 @@ XA PREPARE '789';
 
 CONNECT (con3,localhost,root,,);
 CONNECTION con3;
-# The server would issue this warning on restart.
-call mtr.add_suppression("Found 3 prepared XA transactions");
 
 # Kill the server without sending a shutdown command
 -- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
diff --git a/mysql-test/suite/parts/inc/partition_mgm_crash.inc b/mysql-test/suite/parts/inc/partition_mgm_crash.inc
index 2148d7ed1b6..af5ca1688cf 100644
--- a/mysql-test/suite/parts/inc/partition_mgm_crash.inc
+++ b/mysql-test/suite/parts/inc/partition_mgm_crash.inc
@@ -9,7 +9,7 @@
 --echo # after timed out COALESCE PARTITION
 --echo # Extended crash recovery testing of fast_alter_partition_table.
 call mtr.add_suppression("Attempting backtrace. You can use the following information to find out");
-
+flush tables;
 let $create_statement= CREATE TABLE t1 (a INT, b VARCHAR(64))
 ENGINE = $engine
 PARTITION BY LIST (a)
diff --git a/mysql-test/suite/parts/r/partition_debug_innodb.result b/mysql-test/suite/parts/r/partition_debug_innodb.result
index aff45690de3..c60b1e17979 100644
--- a/mysql-test/suite/parts/r/partition_debug_innodb.result
+++ b/mysql-test/suite/parts/r/partition_debug_innodb.result
@@ -10,6 +10,7 @@ call mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop table ");
 # after timed out COALESCE PARTITION
 # Extended crash recovery testing of fast_alter_partition_table.
 call mtr.add_suppression("Attempting backtrace. You can use the following information to find out");
+flush tables;
 # Crash testing ADD PARTITION
 SET SESSION debug_dbug="+d,crash_add_partition_1";
 CREATE TABLE t1 (a INT, b VARCHAR(64))
diff --git a/mysql-test/suite/parts/r/partition_debug_myisam.result b/mysql-test/suite/parts/r/partition_debug_myisam.result
index ebd470ad6e1..2411d58169e 100644
--- a/mysql-test/suite/parts/r/partition_debug_myisam.result
+++ b/mysql-test/suite/parts/r/partition_debug_myisam.result
@@ -7,6 +7,7 @@ DROP TABLE IF EXISTS t1;
 # after timed out COALESCE PARTITION
 # Extended crash recovery testing of fast_alter_partition_table.
 call mtr.add_suppression("Attempting backtrace. You can use the following information to find out");
+flush tables;
 # Crash testing ADD PARTITION
 SET SESSION debug_dbug="+d,crash_add_partition_1";
 CREATE TABLE t1 (a INT, b VARCHAR(64))
diff --git a/mysql-test/suite/perfschema/t/all_instances.test b/mysql-test/suite/perfschema/t/all_instances.test
index 76262e78255..18e1f0c179f 100644
--- a/mysql-test/suite/perfschema/t/all_instances.test
+++ b/mysql-test/suite/perfschema/t/all_instances.test
@@ -4,6 +4,7 @@
 --source include/have_archive.inc
 --source include/have_blackhole.inc
 --source include/have_ssl.inc
+--source include/not_windows.inc
 
 use performance_schema;
 
diff --git a/mysql-test/suite/rpl/r/rpl_sync.result b/mysql-test/suite/rpl/r/rpl_sync.result
index 3d61fcb80cc..f6163c74b01 100644
--- a/mysql-test/suite/rpl/r/rpl_sync.result
+++ b/mysql-test/suite/rpl/r/rpl_sync.result
@@ -3,6 +3,7 @@ include/master-slave.inc
 [connection master]
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
+flush tables;
 CREATE TABLE t1(a INT, PRIMARY KEY(a)) engine=innodb;
 insert into t1(a) values(1);
 insert into t1(a) values(2);
diff --git a/mysql-test/suite/rpl/t/rpl_bug41902.test b/mysql-test/suite/rpl/t/rpl_bug41902.test
index ad9f8d16fb3..fe9452b0eda 100644
--- a/mysql-test/suite/rpl/t/rpl_bug41902.test
+++ b/mysql-test/suite/rpl/t/rpl_bug41902.test
@@ -52,10 +52,10 @@ purge binary logs to 'master-bin.000001';
 
 --disable_query_log
 call mtr.add_suppression("Failed to locate old binlog or relay log files");
-call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ./master-bin.000001 not listed in the index");
+call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ..master-bin.000001 not listed in the index");
 connection slave;
 call mtr.add_suppression("Failed to locate old binlog or relay log files");
-call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ./master-bin.000001 not listed in the index");
+call mtr.add_suppression("MYSQL_BIN_LOG::purge_logs was called with file ..master-bin.000001 not listed in the index");
 --enable_query_log
 
 --echo ==== clean up ====
diff --git a/mysql-test/suite/rpl/t/rpl_sync.test b/mysql-test/suite/rpl/t/rpl_sync.test
index 859f0465654..8357c0acee6 100644
--- a/mysql-test/suite/rpl/t/rpl_sync.test
+++ b/mysql-test/suite/rpl/t/rpl_sync.test
@@ -35,6 +35,7 @@
 
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");
+flush tables;
 CREATE TABLE t1(a INT, PRIMARY KEY(a)) engine=innodb;
 
 insert into t1(a) values(1);
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 646d829a51e..ace785948e0 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -71,9 +71,8 @@
 #ifdef WITH_PARTITION_STORAGE_ENGINE
 #include "ha_partition.h"
 
-/* TODO: Change abort() to DBUG_SUICIDE() when bug#52002 is pushed */
 #define ERROR_INJECT_CRASH(code) \
-  DBUG_EVALUATE_IF(code, (abort(), 0), 0)
+  DBUG_EVALUATE_IF(code, (DBUG_SUICIDE(), 0), 0)
 #define ERROR_INJECT_ERROR(code) \
   DBUG_EVALUATE_IF(code, (my_error(ER_UNKNOWN_ERROR, MYF(0)), TRUE), 0)