diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-04 18:32:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-04 18:36:30 +0200 |
| commit | 8898c1614d31a73b653988a0d8e13cee8f3e00b0 (patch) | |
| tree | 8241e6298cc5175bb37bfada2f6e5b627ecfea9f /mysql-test/t | |
| parent | a62ebf2590800d70c19f1063e6a506969dd2f7a0 (diff) | |
| download | mariadb-git-8898c1614d31a73b653988a0d8e13cee8f3e00b0.tar.gz | |
cleanup: remove test include file, clarify the comment
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/tc_heuristic_recover.test | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/mysql-test/t/tc_heuristic_recover.test b/mysql-test/t/tc_heuristic_recover.test index c9fa767c249..8cbf7d61143 100644 --- a/mysql-test/t/tc_heuristic_recover.test +++ b/mysql-test/t/tc_heuristic_recover.test @@ -9,7 +9,7 @@ # All this proves no crashes and effective rollback of the transaction. # --source include/have_innodb.inc -# The test logics really requires --log-bin. +# The test logic really requires --log-bin. --source include/have_binlog_format_mixed.inc --source include/have_debug_sync.inc --source include/not_embedded.inc @@ -22,14 +22,7 @@ call mtr.add_suppression("Aborting"); # # The "restart" expect-file facility can't be engaged because the server # having conflicting options may not succeed to boot up. -# Also notice $MYSQLD_CMD is too "static" being unaware of the actual options -# of the last (before shutdown or kill) server run. -# That's why $MYSQLD_LAST_CMD that allows for the server new start -# with more options appended to a stub set which is settled at this very point. ---let $mysqld_stub_cmd= $MYSQLD_LAST_CMD ---let $error_log= $MYSQLTEST_VARDIR/log/mysqld.1.err ---let SEARCH_FILE= $error_log -set debug_sync='RESET'; +--let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err CREATE TABLE t1 (i INT) ENGINE=InnoDB; SET GLOBAL innodb_flush_log_at_trx_commit=1; @@ -55,8 +48,8 @@ SELECT * FROM t1; # TODO: MDEV-12700 Allow innodb_read_only startup without prior slow shutdown. --source include/kill_mysqld.inc ---let $restart_parameters= --innodb-force-recovery=4 ---source include/fail_start_mysqld.inc +--error 1 +--exec $MYSQLD_LAST_CMD --log-bin=master-bin --binlog-format=mixed --core-file --loose-debug-sync-timeout=300 --innodb-force-recovery=4 --let SEARCH_PATTERN= was in the XA prepared state --source include/search_pattern_in_file.inc @@ -65,8 +58,8 @@ SELECT * FROM t1; --let SEARCH_PATTERN= \\[ERROR\\] Can\\'t init tc log --source include/search_pattern_in_file.inc ---let $restart_parameters= --innodb-force-recovery=4 --tc-heuristic-recover=COMMIT ---source include/fail_start_mysqld.inc +--error 1 +--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 --let SEARCH_PATTERN= was in the XA prepared state --source include/search_pattern_in_file.inc --let SEARCH_PATTERN= Found 1 prepared transactions! @@ -76,8 +69,8 @@ SELECT * FROM t1; --let SEARCH_PATTERN= Please restart mysqld without --tc-heuristic-recover --source include/search_pattern_in_file.inc ---let $restart_parameters= --tc-heuristic-recover=ROLLBACK ---source include/fail_start_mysqld.inc +--error 1 +--exec $MYSQLD_LAST_CMD --log-bin=master-bin --binlog-format=mixed --core-file --loose-debug-sync-timeout=300 --tc-heuristic-recover=ROLLBACK --let SEARCH_PATTERN= was in the XA prepared state --source include/search_pattern_in_file.inc @@ -88,7 +81,6 @@ SELECT * FROM t1; --let SEARCH_PATTERN= Please restart mysqld without --tc-heuristic-recover --source include/search_pattern_in_file.inc ---let $restart_parameters= --source include/start_mysqld.inc --let SEARCH_PATTERN= was in the XA prepared state |