Skip to content

Commit 8898c16

Browse files
committed
cleanup: remove test include file, clarify the comment
1 parent a62ebf2 commit 8898c16

File tree

4 files changed

+11
-38
lines changed

4 files changed

+11
-38
lines changed

mysql-test/include/fail_start_mysqld.inc

Lines changed: 0 additions & 18 deletions
This file was deleted.

mysql-test/mysql-test-run.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5055,9 +5055,9 @@ ($$)
50555055
}
50565056

50575057

5058-
# "Dynamic" version of MYSQLD_CMD is reevaluated with each mysqld_start.
5059-
# Use it to restart the server at testing a failing server start (e.g
5060-
# due to incompatible options).
5058+
# Command line for mysqld started for *this particular test*.
5059+
# Differs from "generic" MYSQLD_CMD by including all command line
5060+
# options from *.opt and *.combination files.
50615061
$ENV{'MYSQLD_LAST_CMD'}= "$exe @$args";
50625062

50635063
if ( $opt_gdb || $opt_manual_gdb )

mysql-test/r/tc_heuristic_recover.result

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
call mtr.add_suppression("Can't init tc log");
22
call mtr.add_suppression("Found 1 prepared transactions!");
33
call mtr.add_suppression("Aborting");
4-
set debug_sync='RESET';
54
CREATE TABLE t1 (i INT) ENGINE=InnoDB;
65
SET GLOBAL innodb_flush_log_at_trx_commit=1;
76
FLUSH TABLES;

mysql-test/t/tc_heuristic_recover.test

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# All this proves no crashes and effective rollback of the transaction.
1010
#
1111
--source include/have_innodb.inc
12-
# The test logics really requires --log-bin.
12+
# The test logic really requires --log-bin.
1313
--source include/have_binlog_format_mixed.inc
1414
--source include/have_debug_sync.inc
1515
--source include/not_embedded.inc
@@ -22,14 +22,7 @@ call mtr.add_suppression("Aborting");
2222
#
2323
# The "restart" expect-file facility can't be engaged because the server
2424
# having conflicting options may not succeed to boot up.
25-
# Also notice $MYSQLD_CMD is too "static" being unaware of the actual options
26-
# of the last (before shutdown or kill) server run.
27-
# That's why $MYSQLD_LAST_CMD that allows for the server new start
28-
# with more options appended to a stub set which is settled at this very point.
29-
--let $mysqld_stub_cmd= $MYSQLD_LAST_CMD
30-
--let $error_log= $MYSQLTEST_VARDIR/log/mysqld.1.err
31-
--let SEARCH_FILE= $error_log
32-
set debug_sync='RESET';
25+
--let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
3326

3427
CREATE TABLE t1 (i INT) ENGINE=InnoDB;
3528
SET GLOBAL innodb_flush_log_at_trx_commit=1;
@@ -55,8 +48,8 @@ SELECT * FROM t1;
5548

5649
# TODO: MDEV-12700 Allow innodb_read_only startup without prior slow shutdown.
5750
--source include/kill_mysqld.inc
58-
--let $restart_parameters= --innodb-force-recovery=4
59-
--source include/fail_start_mysqld.inc
51+
--error 1
52+
--exec $MYSQLD_LAST_CMD --log-bin=master-bin --binlog-format=mixed --core-file --loose-debug-sync-timeout=300 --innodb-force-recovery=4
6053

6154
--let SEARCH_PATTERN= was in the XA prepared state
6255
--source include/search_pattern_in_file.inc
@@ -65,8 +58,8 @@ SELECT * FROM t1;
6558
--let SEARCH_PATTERN= \\[ERROR\\] Can\\'t init tc log
6659
--source include/search_pattern_in_file.inc
6760

68-
--let $restart_parameters= --innodb-force-recovery=4 --tc-heuristic-recover=COMMIT
69-
--source include/fail_start_mysqld.inc
61+
--error 1
62+
--exec $MYSQLD_LAST_CMD --log-bin=master-bin --binlog-format=mixed --core-file --loose-debug-sync-timeout=300 --innodb-force-recovery=4 --tc-heuristic-recover=COMMIT
7063
--let SEARCH_PATTERN= was in the XA prepared state
7164
--source include/search_pattern_in_file.inc
7265
--let SEARCH_PATTERN= Found 1 prepared transactions!
@@ -76,8 +69,8 @@ SELECT * FROM t1;
7669
--let SEARCH_PATTERN= Please restart mysqld without --tc-heuristic-recover
7770
--source include/search_pattern_in_file.inc
7871

79-
--let $restart_parameters= --tc-heuristic-recover=ROLLBACK
80-
--source include/fail_start_mysqld.inc
72+
--error 1
73+
--exec $MYSQLD_LAST_CMD --log-bin=master-bin --binlog-format=mixed --core-file --loose-debug-sync-timeout=300 --tc-heuristic-recover=ROLLBACK
8174

8275
--let SEARCH_PATTERN= was in the XA prepared state
8376
--source include/search_pattern_in_file.inc
@@ -88,7 +81,6 @@ SELECT * FROM t1;
8881
--let SEARCH_PATTERN= Please restart mysqld without --tc-heuristic-recover
8982
--source include/search_pattern_in_file.inc
9083

91-
--let $restart_parameters=
9284
--source include/start_mysqld.inc
9385

9486
--let SEARCH_PATTERN= was in the XA prepared state

0 commit comments

Comments
 (0)