@@ -5,7 +5,7 @@ SET GLOBAL innodb_instant_alter_column_allowed = DEFAULT; call mtr.add_suppression("Cannot add field `.*` in table `test`.`.*` because after adding it, the row size is"); CREATE TABLE t(a INT UNIQUE)ENGINE=InnoDB ROW_FORMAT=COMPACT; -ALTER TABLE t ADD e INT, ROW_FORMAT=COMPRESSED; +ALTER TABLE t ADD e INT, ROW_FORMAT=DYNAMIC; INSERT INTO t SET a=1; SET @old_instant= (SELECT variable_value FROM information_schema.global_status @@ -36,17 +36,17 @@ `c` int(11) NOT NULL, `d` int(11) NOT NULL, UNIQUE KEY `a` (`a`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=COMPRESSED +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=DYNAMIC SELECT variable_value-@old_instant instants FROM information_schema.global_status WHERE variable_name = 'innodb_instant_alter_column'; instants -0 +1 SELECT variable_value-@old_instant instants FROM information_schema.global_status WHERE variable_name = 'innodb_instant_alter_column'; instants -0 +1 DROP TABLE t; connect analyze, localhost, root; connection default; @@ -404,7 +404,7 @@ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE name = 'test/big'; clust_index_size -3 +1 connection default; ALTER TABLE big ADD COLUMN (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde', @@ -428,7 +428,7 @@ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE name = 'test/big'; clust_index_size -7 +3 connection default; ROLLBACK; CHECKSUM TABLE big; @@ -442,7 +442,7 @@ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE name = 'test/big'; clust_index_size -3 +1 connection default; InnoDB 0 transactions not purged DROP TABLE t1,t2,t3,t4,big; @@ -1326,7 +1326,7 @@ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE name = 'test/big'; clust_index_size -3 +1 connection default; ALTER TABLE big ADD COLUMN (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde', @@ -1350,7 +1350,7 @@ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE name = 'test/big'; clust_index_size -7 +3 connection default; ROLLBACK; CHECKSUM TABLE big; @@ -1364,7 +1364,7 @@ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE name = 'test/big'; clust_index_size -3 +1 connection default; InnoDB 0 transactions not purged DROP TABLE t1,t2,t3,t4,big; @@ -2248,7 +2248,7 @@ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE name = 'test/big'; clust_index_size -3 +1 connection default; ALTER TABLE big ADD COLUMN (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde', @@ -2272,7 +2272,7 @@ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE name = 'test/big'; clust_index_size -7 +3 connection default; ROLLBACK; CHECKSUM TABLE big; @@ -2286,7 +2286,7 @@ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS WHERE name = 'test/big'; clust_index_size -3 +1 connection default; InnoDB 0 transactions not purged DROP TABLE t1,t2,t3,t4,big;