mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
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.
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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)
|
||||
|
@@ -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))
|
||||
|
@@ -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))
|
||||
|
@@ -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;
|
||||
|
||||
|
@@ -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);
|
||||
|
@@ -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 ====
|
||||
|
@@ -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);
|
||||
|
@@ -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)
|
||||
|
||||
|
Reference in New Issue
Block a user