1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge branch '10.3' into 10.4

This commit is contained in:
Sergei Golubchik
2019-09-06 11:53:10 +02:00
750 changed files with 13360 additions and 14832 deletions

View File

@@ -1,4 +1,5 @@
FLUSH TABLES;
call mtr.add_suppression("Found 1 prepared XA transactions");
#
# MDEV-13797 InnoDB may hang if shutdown is initiated soon after startup
# while rolling back recovered incomplete transactions
@@ -8,10 +9,12 @@ BEGIN;
COMMIT;
connect con$c,localhost,root,,;
CREATE TABLE t8 (a SERIAL, b INT UNIQUE, c INT UNIQUE) ENGINE=InnoDB;
BEGIN;
XA START 'x';
INSERT INTO t8 (a) SELECT NULL FROM t;
UPDATE t8 SET a=a+100, b=a;
DELETE FROM t8;
XA END 'x';
XA PREPARE 'x';
connect con$c,localhost,root,,;
CREATE TABLE t7 (a SERIAL, b INT UNIQUE, c INT UNIQUE) ENGINE=InnoDB;
BEGIN;
@@ -65,5 +68,8 @@ CREATE TABLE u(a SERIAL) ENGINE=INNODB;
FLUSH TABLES;
# restart
# restart
XA RECOVER;
formatID gtrid_length bqual_length data
1 1 0 x
# restart
DROP TABLE t,u;