summaryrefslogtreecommitdiff
path: root/mysql-test/suite/binlog/t
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-11-28 13:43:13 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-11-28 13:43:13 +0200
commit9abd70e390bd8ef2e8347677a2aedd00151f0712 (patch)
tree4a86c7d1fa710b98a27119957c588a2b6cf71532 /mysql-test/suite/binlog/t
parentd48db97d0abec7b310fed362da93c575cbbd7124 (diff)
parent6f854d7cfee883cba95602760b71e3a368fe39f4 (diff)
downloadmariadb-git-9abd70e390bd8ef2e8347677a2aedd00151f0712.tar.gz
Merge 10.8 into 10.9
Diffstat (limited to 'mysql-test/suite/binlog/t')
-rw-r--r--mysql-test/suite/binlog/t/binlog_checkpoint.test18
1 files changed, 17 insertions, 1 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_checkpoint.test b/mysql-test/suite/binlog/t/binlog_checkpoint.test
index 19b48ef68b0..4237f33c8af 100644
--- a/mysql-test/suite/binlog/t/binlog_checkpoint.test
+++ b/mysql-test/suite/binlog/t/binlog_checkpoint.test
@@ -212,7 +212,23 @@ XA END 'xa1';
--source include/start_mysqld.inc
--echo ** Proof of shutdown caused ROLLBACK-completed transaction
---source include/show_binlog_events.inc
+
+--let assert_file=$MYSQLTEST_VARDIR/tmp/binlog_decoded.out
+--let datadir=`select @@datadir`
+
+--echo # MYSQL_BINLOG datadir/binlog_file --result-file=assert_file
+--exec $MYSQL_BINLOG $datadir/$binlog_file --result-file=$assert_file
+
+--let $assert_text= No XA statements should be written into the binary log
+--let $assert_count= 0
+--let assert_select= XA START|XA END|XA PREPARE|XA COMMIT|XA ROLLBACK
+--source include/assert_grep.inc
+
+--let $assert_text= The transaction should be rolled back
+--let $assert_count= 1
+--let assert_select= ^ROLLBACK\$
+--source include/assert_grep.inc
+
SELECT * FROM tm;
--eval SELECT * FROM t1 WHERE a = $a