| 1 |
@@ -5,7 +5,7 @@ |
| 2 |
SET GLOBAL innodb_instant_alter_column_allowed = DEFAULT; |
| 3 |
call mtr.add_suppression("Cannot add field `.*` in table `test`.`.*` because after adding it, the row size is"); |
| 4 |
CREATE TABLE t(a INT UNIQUE)ENGINE=InnoDB ROW_FORMAT=COMPACT; |
| 5 |
-ALTER TABLE t ADD e INT, ROW_FORMAT=COMPRESSED; |
| 6 |
+ALTER TABLE t ADD e INT, ROW_FORMAT=DYNAMIC; |
| 7 |
INSERT INTO t SET a=1; |
| 8 |
SET @old_instant= |
| 9 |
(SELECT variable_value FROM information_schema.global_status |
| 10 |
@@ -36,17 +36,17 @@ |
| 11 |
`c` int(11) NOT NULL, |
| 12 |
`d` int(11) NOT NULL, |
| 13 |
UNIQUE KEY `a` (`a`) |
| 14 |
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=COMPRESSED |
| 15 |
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=DYNAMIC |
| 16 |
SELECT variable_value-@old_instant instants |
| 17 |
FROM information_schema.global_status |
| 18 |
WHERE variable_name = 'innodb_instant_alter_column'; |
| 19 |
instants |
| 20 |
-0 |
| 21 |
+1 |
| 22 |
SELECT variable_value-@old_instant instants |
| 23 |
FROM information_schema.global_status |
| 24 |
WHERE variable_name = 'innodb_instant_alter_column'; |
| 25 |
instants |
| 26 |
-0 |
| 27 |
+1 |
| 28 |
DROP TABLE t; |
| 29 |
connect analyze, localhost, root; |
| 30 |
connection default; |
| 31 |
@@ -404,7 +404,7 @@ |
| 32 |
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS |
| 33 |
WHERE name = 'test/big'; |
| 34 |
clust_index_size |
| 35 |
-3 |
| 36 |
+1 |
| 37 |
connection default; |
| 38 |
ALTER TABLE big ADD COLUMN |
| 39 |
(d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde', |
| 40 |
@@ -428,7 +428,7 @@ |
| 41 |
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS |
| 42 |
WHERE name = 'test/big'; |
| 43 |
clust_index_size |
| 44 |
-7 |
| 45 |
+3 |
| 46 |
connection default; |
| 47 |
ROLLBACK; |
| 48 |
CHECKSUM TABLE big; |
| 49 |
@@ -442,7 +442,7 @@ |
| 50 |
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS |
| 51 |
WHERE name = 'test/big'; |
| 52 |
clust_index_size |
| 53 |
-3 |
| 54 |
+1 |
| 55 |
connection default; |
| 56 |
InnoDB 0 transactions not purged |
| 57 |
DROP TABLE t1,t2,t3,t4,big; |
| 58 |
@@ -1326,7 +1326,7 @@ |
| 59 |
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS |
| 60 |
WHERE name = 'test/big'; |
| 61 |
clust_index_size |
| 62 |
-3 |
| 63 |
+1 |
| 64 |
connection default; |
| 65 |
ALTER TABLE big ADD COLUMN |
| 66 |
(d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde', |
| 67 |
@@ -1350,7 +1350,7 @@ |
| 68 |
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS |
| 69 |
WHERE name = 'test/big'; |
| 70 |
clust_index_size |
| 71 |
-7 |
| 72 |
+3 |
| 73 |
connection default; |
| 74 |
ROLLBACK; |
| 75 |
CHECKSUM TABLE big; |
| 76 |
@@ -1364,7 +1364,7 @@ |
| 77 |
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS |
| 78 |
WHERE name = 'test/big'; |
| 79 |
clust_index_size |
| 80 |
-3 |
| 81 |
+1 |
| 82 |
connection default; |
| 83 |
InnoDB 0 transactions not purged |
| 84 |
DROP TABLE t1,t2,t3,t4,big; |
| 85 |
@@ -2248,7 +2248,7 @@ |
| 86 |
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS |
| 87 |
WHERE name = 'test/big'; |
| 88 |
clust_index_size |
| 89 |
-3 |
| 90 |
+1 |
| 91 |
connection default; |
| 92 |
ALTER TABLE big ADD COLUMN |
| 93 |
(d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde', |
| 94 |
@@ -2272,7 +2272,7 @@ |
| 95 |
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS |
| 96 |
WHERE name = 'test/big'; |
| 97 |
clust_index_size |
| 98 |
-7 |
| 99 |
+3 |
| 100 |
connection default; |
| 101 |
ROLLBACK; |
| 102 |
CHECKSUM TABLE big; |
| 103 |
@@ -2286,7 +2286,7 @@ |
| 104 |
SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS |
| 105 |
WHERE name = 'test/big'; |
| 106 |
clust_index_size |
| 107 |
-3 |
| 108 |
+1 |
| 109 |
connection default; |
| 110 |
InnoDB 0 transactions not purged |
| 111 |
DROP TABLE t1,t2,t3,t4,big; |