summaryrefslogtreecommitdiff
path: root/mysql-test/suite/innodb/r
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-05-07 12:07:58 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-05-07 12:07:58 +0300
commit0db66ab18ffef6d8920e2e6ff66e99516a458a4d (patch)
tree89c3c16241dba29c1eb136d37022fc3a392ba831 /mysql-test/suite/innodb/r
parentb4e8ad5080eeeda283f93fbf7f84d7580ec829c0 (diff)
parent7b9486d2eb3876d55edc05173235e6ccad2e6ae3 (diff)
downloadmariadb-git-0db66ab18ffef6d8920e2e6ff66e99516a458a4d.tar.gz
Merge 10.0 into 10.1
Diffstat (limited to 'mysql-test/suite/innodb/r')
-rw-r--r--mysql-test/suite/innodb/r/alter_partitioned_xa.result15
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/alter_partitioned_xa.result b/mysql-test/suite/innodb/r/alter_partitioned_xa.result
new file mode 100644
index 00000000000..4bce2f8676f
--- /dev/null
+++ b/mysql-test/suite/innodb/r/alter_partitioned_xa.result
@@ -0,0 +1,15 @@
+#
+# MDEV-14693 XA: Assertion `!clust_index->online_log' failed
+# in rollback_inplace_alter_table
+#
+CREATE TABLE t1 (a INT, b INT) ENGINE=InnoDB PARTITION BY HASH(a) PARTITIONS 2;
+XA START 'xid';
+INSERT INTO t1 VALUES (1,10);
+CREATE DATABASE IF NOT EXISTS db;
+ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the ACTIVE state
+SET innodb_lock_wait_timeout= 1, lock_wait_timeout= 2;
+ALTER TABLE t1 FORCE;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+XA END 'xid';
+XA ROLLBACK 'xid';
+DROP TABLE t1;