[Commits] Rev 3204: Fix some failing tests on Windows in file:///H:/bzr/5.5/

Vladislav Vaintroub wlad at montyprogram.com
Fri Jan 6 14:07:20 EET 2012


At file:///H:/bzr/5.5/

------------------------------------------------------------
revno: 3204
revision-id: wlad at montyprogram.com-20120106120720-3cynl6ibdg2165ai
parent: sergii at pisem.net-20120104230257-ai5c1c7jh9ggamwb
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 5.5
timestamp: Fri 2012-01-06 13:07:20 +0100
message:
  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.
-------------- next part --------------
=== modified file 'mysql-test/suite/innodb/r/innodb_bug59641.result'
--- a/mysql-test/suite/innodb/r/innodb_bug59641.result	2011-10-19 19:45:18 +0000
+++ b/mysql-test/suite/innodb/r/innodb_bug59641.result	2012-01-06 12:07:20 +0000
@@ -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 @@
 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

=== modified file 'mysql-test/suite/innodb/t/innodb_bug59641.test'
--- a/mysql-test/suite/innodb/t/innodb_bug59641.test	2011-10-19 19:45:18 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug59641.test	2012-01-06 12:07:20 +0000
@@ -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 @@
 
 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

=== modified file 'mysql-test/suite/parts/inc/partition_mgm_crash.inc'
--- a/mysql-test/suite/parts/inc/partition_mgm_crash.inc	2010-08-13 07:50:25 +0000
+++ b/mysql-test/suite/parts/inc/partition_mgm_crash.inc	2012-01-06 12:07:20 +0000
@@ -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)

=== modified file 'mysql-test/suite/parts/r/partition_debug_innodb.result'
--- a/mysql-test/suite/parts/r/partition_debug_innodb.result	2011-12-15 21:07:58 +0000
+++ b/mysql-test/suite/parts/r/partition_debug_innodb.result	2012-01-06 12:07:20 +0000
@@ -10,6 +10,7 @@
 # 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))

=== modified file 'mysql-test/suite/parts/r/partition_debug_myisam.result'
--- a/mysql-test/suite/parts/r/partition_debug_myisam.result	2011-12-15 21:07:58 +0000
+++ b/mysql-test/suite/parts/r/partition_debug_myisam.result	2012-01-06 12:07:20 +0000
@@ -7,6 +7,7 @@
 # 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))

=== modified file 'mysql-test/suite/perfschema/t/all_instances.test'
--- a/mysql-test/suite/perfschema/t/all_instances.test	2011-11-03 22:39:53 +0000
+++ b/mysql-test/suite/perfschema/t/all_instances.test	2012-01-06 12:07:20 +0000
@@ -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;
 

=== modified file 'mysql-test/suite/rpl/r/rpl_sync.result'
--- a/mysql-test/suite/rpl/r/rpl_sync.result	2011-12-15 21:07:58 +0000
+++ b/mysql-test/suite/rpl/r/rpl_sync.result	2012-01-06 12:07:20 +0000
@@ -3,6 +3,7 @@
 [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);

=== modified file 'mysql-test/suite/rpl/t/rpl_bug41902.test'
--- a/mysql-test/suite/rpl/t/rpl_bug41902.test	2011-12-15 21:07:58 +0000
+++ b/mysql-test/suite/rpl/t/rpl_bug41902.test	2012-01-06 12:07:20 +0000
@@ -52,10 +52,10 @@
 
 --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 ====

=== modified file 'mysql-test/suite/rpl/t/rpl_sync.test'
--- a/mysql-test/suite/rpl/t/rpl_sync.test	2011-12-15 21:07:58 +0000
+++ b/mysql-test/suite/rpl/t/rpl_sync.test	2012-01-06 12:07:20 +0000
@@ -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);

=== modified file 'sql/sql_partition.cc'
--- a/sql/sql_partition.cc	2011-11-03 18:17:05 +0000
+++ b/sql/sql_partition.cc	2012-01-06 12:07:20 +0000
@@ -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)
 



More information about the commits mailing list