diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-02 18:29:49 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-02 18:29:49 +0200 |
commit | 6a1e655cb0d400d8ed44fbfd22151b1d3e7f22d8 (patch) | |
tree | 3915bd814fa0ea7c0219b258a1fb458846a5b0bd /mysql-test/main/xa.result | |
parent | e76e12886fd37094d95ca40b8cce45ca3ef28021 (diff) | |
parent | 24ec8eaf66ecd864529309c5edcb8dd6b685f2aa (diff) | |
download | mariadb-git-6a1e655cb0d400d8ed44fbfd22151b1d3e7f22d8.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/xa.result')
-rw-r--r-- | mysql-test/main/xa.result | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/mysql-test/main/xa.result b/mysql-test/main/xa.result index 2fe8316b65b..46c0c8551a1 100644 --- a/mysql-test/main/xa.result +++ b/mysql-test/main/xa.result @@ -297,7 +297,7 @@ DROP TABLE t1; # # Bug#12352846 - TRANS_XA_START(THD*): # ASSERTION THD->TRANSACTION.XID_STATE.XID.IS_NULL() -# FAILED +# FAILED # CREATE TABLE t1 (a INT) ENGINE=InnoDB; CREATE TABLE t2 (a INT) ENGINE=InnoDB; @@ -349,6 +349,32 @@ XA END 'xid1'; XA ROLLBACK 'xid1'; DROP TABLE t1, t2, t3; # +# MDEV 15532 XA: Assertion `!log->same_pk' failed in +# row_log_table_apply_delete +# +CREATE TABLE t1 (a INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1),(2); +connect con1,localhost,root,,test; +XA START 'xid'; +UPDATE t1 SET a = 5; +connection default; +SET innodb_lock_wait_timeout= 2, lock_wait_timeout= 2; +ALTER TABLE non_existing_table1; +ERROR 42S02: Table 'test.non_existing_table1' doesn't exist +ALTER TABLE t1 FORCE;; +connection con1; +ALTER TABLE non_existing_table2; +ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the ACTIVE state +DELETE FROM t1 LIMIT 1; +connection default; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +connection con1; +XA END 'xid'; +XA ROLLBACK 'xid'; +DROP TABLE t1; +disconnect con1; +connection default; +# # MDEV-21766 - Forbid XID with empty 'gtrid' # CREATE TABLE t1(a INT) ENGINE=InnoDB; |