summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/t/alter_kill.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-10-10 06:45:19 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-10-10 06:45:19 +0300
commit61b32df93119635570f42a96d0b99c7ea398430b (patch)
tree479b500e5c9f8267dc26510d04ae06b9baed0a3e /mysql-test/suite/innodb/t/alter_kill.test
parent2610c26a53b4f65f7a8f6ce8b6da96eb39b0cfbf (diff)
parent00b6c7d8fc8a75b023f78d5f08324cba000002b3 (diff)
downloadmariadb-git-61b32df93119635570f42a96d0b99c7ea398430b.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/innodb/t/alter_kill.test')
-rw-r--r--mysql-test/suite/innodb/t/alter_kill.test7
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb/t/alter_kill.test b/mysql-test/suite/innodb/t/alter_kill.test
index 628ff553fc0..8de9781c972 100644
--- a/mysql-test/suite/innodb/t/alter_kill.test
+++ b/mysql-test/suite/innodb/t/alter_kill.test
@@ -129,13 +129,14 @@ INSERT INTO t1 VALUES(42);
CREATE TABLE bug16735660 (a INT PRIMARY KEY) ENGINE=InnoDB;
XA START 'x';
+--source ../include/no_checkpoint_start.inc
INSERT INTO bug16735660 VALUES(1),(2),(3);
XA END 'x';
XA PREPARE 'x';
+--connection default
+--let CLEANUP_IF_CHECKPOINT=XA ROLLBACK 'x';DROP TABLE bug16735660;
+--source ../include/no_checkpoint_end.inc
--- connection default
-
--- source include/kill_mysqld.inc
-- disconnect con1
-- move_file $MYSQLD_DATADIR/test/bug16735660.ibd $MYSQLD_DATADIR/bug16735660.omg