Commit cd04673a authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-32050 fixup: innodb.instant_alter_crash (take 2)

We must disable persistent statistics, because a transaction commit
from dict_stats_save() would occasionally interfere with this test.
parent eb1f8b29
...@@ -3,7 +3,7 @@ FLUSH TABLES; ...@@ -3,7 +3,7 @@ FLUSH TABLES;
# MDEV-11369: Instant ADD COLUMN for InnoDB # MDEV-11369: Instant ADD COLUMN for InnoDB
# #
CREATE TABLE t1(id INT PRIMARY KEY, c2 INT UNIQUE) CREATE TABLE t1(id INT PRIMARY KEY, c2 INT UNIQUE)
ENGINE=InnoDB ROW_FORMAT=REDUNDANT; ENGINE=InnoDB STATS_PERSISTENT=0 ROW_FORMAT=REDUNDANT;
CREATE TABLE t2 LIKE t1; CREATE TABLE t2 LIKE t1;
INSERT INTO t1 VALUES(0,2); INSERT INTO t1 VALUES(0,2);
INSERT INTO t2 VALUES(2,1); INSERT INTO t2 VALUES(2,1);
...@@ -27,7 +27,6 @@ SELECT * FROM t2; ...@@ -27,7 +27,6 @@ SELECT * FROM t2;
id c2 c3 id c2 c3
2 1 De finibus bonorum 2 1 De finibus bonorum
3 4 accusantium doloremque laudantium 3 4 accusantium doloremque laudantium
InnoDB 0 transactions not purged
BEGIN; BEGIN;
DELETE FROM t1; DELETE FROM t1;
ROLLBACK; ROLLBACK;
...@@ -161,7 +160,7 @@ t1 CREATE TABLE `t1` ( ...@@ -161,7 +160,7 @@ t1 CREATE TABLE `t1` (
`c2` int(11) DEFAULT NULL, `c2` int(11) DEFAULT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `c2` (`c2`) UNIQUE KEY `c2` (`c2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=REDUNDANT ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0 ROW_FORMAT=REDUNDANT
SHOW CREATE TABLE t2; SHOW CREATE TABLE t2;
Table Create Table Table Create Table
t2 CREATE TABLE `t2` ( t2 CREATE TABLE `t2` (
...@@ -169,7 +168,7 @@ t2 CREATE TABLE `t2` ( ...@@ -169,7 +168,7 @@ t2 CREATE TABLE `t2` (
`c2` int(11) DEFAULT NULL, `c2` int(11) DEFAULT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `c2` (`c2`) UNIQUE KEY `c2` (`c2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=REDUNDANT ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=0 ROW_FORMAT=REDUNDANT
SHOW CREATE TABLE t3; SHOW CREATE TABLE t3;
Table Create Table Table Create Table
t3 CREATE TABLE `t3` ( t3 CREATE TABLE `t3` (
......
...@@ -14,7 +14,7 @@ let MYSQLD_DATADIR=`select @@datadir`; ...@@ -14,7 +14,7 @@ let MYSQLD_DATADIR=`select @@datadir`;
--echo # --echo #
CREATE TABLE t1(id INT PRIMARY KEY, c2 INT UNIQUE) CREATE TABLE t1(id INT PRIMARY KEY, c2 INT UNIQUE)
ENGINE=InnoDB ROW_FORMAT=REDUNDANT; ENGINE=InnoDB STATS_PERSISTENT=0 ROW_FORMAT=REDUNDANT;
CREATE TABLE t2 LIKE t1; CREATE TABLE t2 LIKE t1;
INSERT INTO t1 VALUES(0,2); INSERT INTO t1 VALUES(0,2);
INSERT INTO t2 VALUES(2,1); INSERT INTO t2 VALUES(2,1);
...@@ -38,7 +38,6 @@ disconnect ddl; ...@@ -38,7 +38,6 @@ disconnect ddl;
SELECT * FROM t1; SELECT * FROM t1;
SELECT * FROM t2; SELECT * FROM t2;
--source include/wait_all_purged.inc
BEGIN; BEGIN;
DELETE FROM t1; DELETE FROM t1;
ROLLBACK; ROLLBACK;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment