9
9
# All this proves no crashes and effective rollback of the transaction.
10
10
#
11
11
--source include/have_innodb.inc
12
- # The test logics really requires --log-bin.
12
+ # The test logic really requires --log-bin.
13
13
--source include/have_binlog_format_mixed.inc
14
14
--source include/have_debug_sync.inc
15
15
--source include/not_embedded.inc
@@ -22,14 +22,7 @@ call mtr.add_suppression("Aborting");
22
22
#
23
23
# The "restart" expect-file facility can't be engaged because the server
24
24
# 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
33
26
34
27
CREATE TABLE t1 (i INT) ENGINE=InnoDB;
35
28
SET GLOBAL innodb_flush_log_at_trx_commit=1;
@@ -55,8 +48,8 @@ SELECT * FROM t1;
55
48
56
49
# TODO: MDEV-12700 Allow innodb_read_only startup without prior slow shutdown.
57
50
--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
60
53
61
54
--let SEARCH_PATTERN= was in the XA prepared state
62
55
--source include/search_pattern_in_file.inc
@@ -65,8 +58,8 @@ SELECT * FROM t1;
65
58
--let SEARCH_PATTERN= \\[ERROR\\] Can\\'t init tc log
66
59
--source include/search_pattern_in_file.inc
67
60
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
70
63
--let SEARCH_PATTERN= was in the XA prepared state
71
64
--source include/search_pattern_in_file.inc
72
65
--let SEARCH_PATTERN= Found 1 prepared transactions!
@@ -76,8 +69,8 @@ SELECT * FROM t1;
76
69
--let SEARCH_PATTERN= Please restart mysqld without --tc-heuristic-recover
77
70
--source include/search_pattern_in_file.inc
78
71
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
81
74
82
75
--let SEARCH_PATTERN= was in the XA prepared state
83
76
--source include/search_pattern_in_file.inc
@@ -88,7 +81,6 @@ SELECT * FROM t1;
88
81
--let SEARCH_PATTERN= Please restart mysqld without --tc-heuristic-recover
89
82
--source include/search_pattern_in_file.inc
90
83
91
- --let $restart_parameters=
92
84
--source include/start_mysqld.inc
93
85
94
86
--let SEARCH_PATTERN= was in the XA prepared state
0 commit comments