Revert changes to innodb.instant_alter test

mysql-test/suite/innodb/r/instant_alter,32k.rdiff

---- instant_alter.result	2018-09-19 21:48:19.370042564 +0530
-+++ instant_alter.reject	2018-09-19 21:48:32.633985253 +0530
+--- instant_alter.result
++++ instant_alter,32k.result
 @@ -2,7 +2,7 @@
  # MDEV-11369: Instant ADD COLUMN for InnoDB
  #
@@ -30,129 +30,84 @@
  DROP TABLE t;
  connect analyze, localhost, root;
  connection default;
-@@ -240,7 +240,7 @@
- SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
- clust_index_size
--5
-+1
- connection default;
- ROLLBACK;
- connection analyze;
-@@ -250,7 +250,7 @@
- SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
- clust_index_size
--3
-+1
- connection default;
- BEGIN;
- UPDATE t2 SET d1 = repeat(id, 200);
-@@ -261,7 +261,7 @@
- SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
- clust_index_size
--3
-+1
- connection default;
- ROLLBACK;
- connection analyze;
-@@ -271,7 +271,7 @@
- SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
- clust_index_size
--3
-+1
- connection default;
- ALTER TABLE t2 DROP p;
- affected rows: 0
-@@ -390,7 +390,7 @@
+@@ -374,7 +374,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
 +1
  connection default;
  ALTER TABLE big ADD COLUMN
  (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
-@@ -413,7 +413,7 @@
+@@ -397,7 +397,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--13
+-7
 +5
  connection default;
  ROLLBACK;
  CHECKSUM TABLE big;
-@@ -426,7 +426,7 @@
+@@ -410,7 +410,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
 +1
  connection default;
  InnoDB		0 transactions not purged
- DROP TABLE t1,t2,t3,t4,big;
-@@ -657,7 +657,7 @@
- SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
- clust_index_size
--5
-+1
- connection default;
- ROLLBACK;
- connection analyze;
-@@ -667,7 +667,7 @@
+ DROP TABLE t1,t2,t3,big;
+@@ -734,7 +734,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
+ WHERE name = 'test/big';
  clust_index_size
 -3
 +1
  connection default;
- BEGIN;
- UPDATE t2 SET d1 = repeat(id, 200);
-@@ -678,7 +678,7 @@
+ ALTER TABLE big ADD COLUMN
+ (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
+@@ -757,7 +757,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
+ WHERE name = 'test/big';
  clust_index_size
--3
-+1
+-7
++5
  connection default;
  ROLLBACK;
- connection analyze;
-@@ -688,7 +688,7 @@
+ CHECKSUM TABLE big;
+@@ -770,7 +770,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
+ WHERE name = 'test/big';
  clust_index_size
 -3
 +1
  connection default;
- ALTER TABLE t2 DROP p;
- affected rows: 0
-@@ -807,7 +807,7 @@
+ InnoDB		0 transactions not purged
+ DROP TABLE t1,t2,t3,big;
+@@ -1094,7 +1094,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
 +1
  connection default;
  ALTER TABLE big ADD COLUMN
  (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
-@@ -830,7 +830,7 @@
+@@ -1117,7 +1117,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--13
+-7
 +5
  connection default;
  ROLLBACK;
  CHECKSUM TABLE big;
-@@ -843,7 +843,7 @@
+@@ -1130,7 +1130,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
 +1
  connection default;
  InnoDB		0 transactions not purged
- DROP TABLE t1,t2,t3,t4,big;
+ DROP TABLE t1,t2,t3,big;

mysql-test/suite/innodb/r/instant_alter,4k.rdiff

---- instant_alter.result	2018-09-19 21:48:19.370042564 +0530
-+++ instant_alter.reject	2018-09-19 21:53:49.490207525 +0530
-@@ -240,7 +240,7 @@
+--- instant_alter.result
++++ instant_alter,4k.result
+@@ -181,7 +181,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--5
+-1
 +6
  connection default;
  ROLLBACK;
@@ -13,7 +13,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--3
+-1
 +4
  connection default;
  BEGIN;
@@ -22,7 +22,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--3
+-1
 +4
  connection default;
  ROLLBACK;
@@ -31,98 +31,161 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
+-1
++4
+ connection default;
+ ALTER TABLE t2 DROP p;
+ affected rows: 0
+@@ -374,7 +374,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/big';
+ clust_index_size
+-3
++8
+ connection default;
+ ALTER TABLE big ADD COLUMN
+ (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
+@@ -397,7 +397,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/big';
+ clust_index_size
+-7
++28
+ connection default;
+ ROLLBACK;
+ CHECKSUM TABLE big;
+@@ -410,7 +410,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/big';
+ clust_index_size
 -3
++8
+ connection default;
+ InnoDB		0 transactions not purged
+ DROP TABLE t1,t2,t3,big;
+@@ -600,7 +600,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/t2';
+ clust_index_size
+-1
++6
+ connection default;
+ ROLLBACK;
+ connection analyze;
+@@ -610,7 +610,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/t2';
+ clust_index_size
+-1
++4
+ connection default;
+ BEGIN;
+ UPDATE t2 SET d1 = repeat(id, 200);
+@@ -621,7 +621,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/t2';
+ clust_index_size
+-1
++4
+ connection default;
+ ROLLBACK;
+ connection analyze;
+@@ -631,7 +631,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/t2';
+ clust_index_size
+-1
 +4
  connection default;
  ALTER TABLE t2 DROP p;
  affected rows: 0
-@@ -390,7 +390,7 @@
+@@ -734,7 +734,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
 +7
  connection default;
  ALTER TABLE big ADD COLUMN
  (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
-@@ -413,7 +413,7 @@
+@@ -757,7 +757,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--13
+-7
 +23
  connection default;
  ROLLBACK;
  CHECKSUM TABLE big;
-@@ -426,7 +426,7 @@
+@@ -770,7 +770,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
 +7
  connection default;
  InnoDB		0 transactions not purged
- DROP TABLE t1,t2,t3,t4,big;
-@@ -657,7 +657,7 @@
+ DROP TABLE t1,t2,t3,big;
+@@ -960,7 +960,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--5
+-1
 +6
  connection default;
  ROLLBACK;
  connection analyze;
-@@ -667,7 +667,7 @@
+@@ -970,7 +970,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--3
+-1
 +4
  connection default;
  BEGIN;
  UPDATE t2 SET d1 = repeat(id, 200);
-@@ -678,7 +678,7 @@
+@@ -981,7 +981,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--3
+-1
 +4
  connection default;
  ROLLBACK;
  connection analyze;
-@@ -688,7 +688,7 @@
+@@ -991,7 +991,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--3
+-1
 +4
  connection default;
  ALTER TABLE t2 DROP p;
  affected rows: 0
-@@ -807,7 +807,7 @@
+@@ -1094,7 +1094,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
 +7
  connection default;
  ALTER TABLE big ADD COLUMN
  (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
-@@ -830,7 +830,7 @@
+@@ -1117,7 +1117,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--13
+-7
 +23
  connection default;
  ROLLBACK;
  CHECKSUM TABLE big;
-@@ -843,7 +843,7 @@
+@@ -1130,7 +1130,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
 +7
  connection default;
  InnoDB		0 transactions not purged
- DROP TABLE t1,t2,t3,t4,big;
+ DROP TABLE t1,t2,t3,big;

mysql-test/suite/innodb/r/instant_alter,64k.rdiff

---- instant_alter.result	2018-09-19 21:48:19.370042564 +0530
-+++ instant_alter.reject	2018-09-19 21:52:31.729867852 +0530
+--- instant_alter.result
++++ instant_alter,64k.result
 @@ -2,7 +2,7 @@
  # MDEV-11369: Instant ADD COLUMN for InnoDB
  #
@@ -30,129 +30,84 @@
  DROP TABLE t;
  connect analyze, localhost, root;
  connection default;
-@@ -240,7 +240,7 @@
- SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
- clust_index_size
--5
-+1
- connection default;
- ROLLBACK;
- connection analyze;
-@@ -250,7 +250,7 @@
- SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
- clust_index_size
--3
-+1
- connection default;
- BEGIN;
- UPDATE t2 SET d1 = repeat(id, 200);
-@@ -261,7 +261,7 @@
- SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
- clust_index_size
--3
-+1
- connection default;
- ROLLBACK;
- connection analyze;
-@@ -271,7 +271,7 @@
- SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
- clust_index_size
--3
-+1
- connection default;
- ALTER TABLE t2 DROP p;
- affected rows: 0
-@@ -390,7 +390,7 @@
+@@ -374,7 +374,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
 +1
  connection default;
  ALTER TABLE big ADD COLUMN
  (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
-@@ -413,7 +413,7 @@
+@@ -397,7 +397,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--13
+-7
 +3
  connection default;
  ROLLBACK;
  CHECKSUM TABLE big;
-@@ -426,7 +426,7 @@
+@@ -410,7 +410,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
 +1
  connection default;
  InnoDB		0 transactions not purged
- DROP TABLE t1,t2,t3,t4,big;
-@@ -657,7 +657,7 @@
- SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
- clust_index_size
--5
-+1
- connection default;
- ROLLBACK;
- connection analyze;
-@@ -667,7 +667,7 @@
+ DROP TABLE t1,t2,t3,big;
+@@ -734,7 +734,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
+ WHERE name = 'test/big';
  clust_index_size
 -3
 +1
  connection default;
- BEGIN;
- UPDATE t2 SET d1 = repeat(id, 200);
-@@ -678,7 +678,7 @@
+ ALTER TABLE big ADD COLUMN
+ (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
+@@ -757,7 +757,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
+ WHERE name = 'test/big';
  clust_index_size
--3
-+1
+-7
++3
  connection default;
  ROLLBACK;
- connection analyze;
-@@ -688,7 +688,7 @@
+ CHECKSUM TABLE big;
+@@ -770,7 +770,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
- WHERE name = 'test/t2';
+ WHERE name = 'test/big';
  clust_index_size
 -3
 +1
  connection default;
- ALTER TABLE t2 DROP p;
- affected rows: 0
-@@ -807,7 +807,7 @@
+ InnoDB		0 transactions not purged
+ DROP TABLE t1,t2,t3,big;
+@@ -1094,7 +1094,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
 +1
  connection default;
  ALTER TABLE big ADD COLUMN
  (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
-@@ -830,7 +830,7 @@
+@@ -1117,7 +1117,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--13
+-7
 +3
  connection default;
  ROLLBACK;
  CHECKSUM TABLE big;
-@@ -843,7 +843,7 @@
+@@ -1130,7 +1130,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
 +1
  connection default;
  InnoDB		0 transactions not purged
- DROP TABLE t1,t2,t3,t4,big;
+ DROP TABLE t1,t2,t3,big;

mysql-test/suite/innodb/r/instant_alter,16k.rdiff → mysql-test/suite/innodb/r/instant_alter,8k.rdiff

---- instant_alter.result	2018-09-19 21:48:19.370042564 +0530
-+++ instant_alter.reject	2018-09-19 21:53:12.050032986 +0530
+--- instant_alter.result
++++ instant_alter,8k.result
 @@ -240,7 +240,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--5
-+1
+-1
++5
  connection default;
  ROLLBACK;
  connection analyze;
@@ -13,8 +13,8 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--3
-+1
+-1
++3
  connection default;
  BEGIN;
  UPDATE t2 SET d1 = repeat(id, 200);
@@ -22,8 +22,8 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--3
-+1
+-1
++3
  connection default;
  ROLLBACK;
  connection analyze;
@@ -31,98 +31,161 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--3
-+1
+-1
++3
  connection default;
  ALTER TABLE t2 DROP p;
  affected rows: 0
-@@ -390,7 +390,7 @@
+@@ -374,7 +374,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
-+3
+-3
++5
  connection default;
  ALTER TABLE big ADD COLUMN
  (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
-@@ -413,7 +413,7 @@
+@@ -397,7 +397,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--13
-+7
+-7
++13
  connection default;
  ROLLBACK;
  CHECKSUM TABLE big;
-@@ -426,7 +426,7 @@
+@@ -410,7 +410,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
-+3
+-3
++5
  connection default;
  InnoDB		0 transactions not purged
- DROP TABLE t1,t2,t3,t4,big;
-@@ -657,7 +657,7 @@
+ DROP TABLE t1,t2,t3,big;
+@@ -600,7 +600,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--5
-+1
+-1
++5
  connection default;
  ROLLBACK;
  connection analyze;
-@@ -667,7 +667,7 @@
+@@ -610,7 +610,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--3
-+1
+-1
++3
  connection default;
  BEGIN;
  UPDATE t2 SET d1 = repeat(id, 200);
-@@ -678,7 +678,7 @@
+@@ -621,7 +621,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--3
-+1
+-1
++3
  connection default;
  ROLLBACK;
  connection analyze;
-@@ -688,7 +688,7 @@
+@@ -631,7 +631,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/t2';
  clust_index_size
--3
-+1
+-1
++3
  connection default;
  ALTER TABLE t2 DROP p;
  affected rows: 0
-@@ -807,7 +807,7 @@
+@@ -734,7 +734,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
-+3
+-3
++5
  connection default;
  ALTER TABLE big ADD COLUMN
  (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
-@@ -830,7 +830,7 @@
+@@ -757,7 +757,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--13
-+7
+-7
++13
  connection default;
  ROLLBACK;
  CHECKSUM TABLE big;
-@@ -843,7 +843,7 @@
+@@ -770,7 +770,7 @@
  SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
  WHERE name = 'test/big';
  clust_index_size
--5
+-3
++5
+ connection default;
+ InnoDB		0 transactions not purged
+ DROP TABLE t1,t2,t3,big;
+@@ -960,7 +960,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/t2';
+ clust_index_size
+-1
++5
+ connection default;
+ ROLLBACK;
+ connection analyze;
+@@ -970,7 +970,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/t2';
+ clust_index_size
+-1
++3
+ connection default;
+ BEGIN;
+ UPDATE t2 SET d1 = repeat(id, 200);
+@@ -981,7 +981,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/t2';
+ clust_index_size
+-1
++3
+ connection default;
+ ROLLBACK;
+ connection analyze;
+@@ -991,7 +991,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/t2';
+ clust_index_size
+-1
 +3
+ connection default;
+ ALTER TABLE t2 DROP p;
+ affected rows: 0
+@@ -1094,7 +1094,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/big';
+ clust_index_size
+-3
++5
+ connection default;
+ ALTER TABLE big ADD COLUMN
+ (d1 INT DEFAULT 0, d2 VARCHAR(20) DEFAULT 'abcde',
+@@ -1117,7 +1117,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/big';
+ clust_index_size
+-7
++13
+ connection default;
+ ROLLBACK;
+ CHECKSUM TABLE big;
+@@ -1130,7 +1130,7 @@
+ SELECT clust_index_size FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESTATS
+ WHERE name = 'test/big';
+ clust_index_size
+-3
++5
  connection default;
  InnoDB		0 transactions not purged
- DROP TABLE t1,t2,t3,t4,big;
+ DROP TABLE t1,t2,t3,big;

mysql-test/suite/innodb/t/instant_alter.test

@@ -43,8 +43,7 @@ SET @old_instant=
 (SELECT variable_value FROM information_schema.global_status
 WHERE variable_name = 'innodb_instant_alter_column');
 
-# MDEV-15562 FIXME: implement ROW_FORMAT=REDUNDANT as well!
-let $format= 2;
+let $format= 3;
 while ($format) {
 let $engine= `SELECT CONCAT('ENGINE=InnoDB ROW_FORMAT=',CASE $format
 WHEN 1 THEN 'DYNAMIC'