MDEV-13838: Wrong result after altering a partitioned table

Reverted incorrect changes done on MDEV-7367 and MDEV-9469. Fixes properly also related bugs: MDEV-13668: InnoDB unnecessarily rebuilds table when renaming a column and adding index MDEV-9469: 'Incorrect key file' on ALTER TABLE MDEV-9548: Alter table (renaming and adding index) fails with "Incorrect key file for table" MDEV-10535: ALTER TABLE causes standalone/wsrep cluster crash MDEV-13640: ALTER TABLE CHANGE and ADD INDEX on auto_increment column fails with "Incorrect key file for table..." Root cause for all these bugs is the fact that MariaDB .frm file can contain virtual columns but InnoDB dictionary does not and previous fixes were incorrect or unnecessarily forced table rebuilt. In index creation key_part->fieldnr can be bigger than number of columns in InnoDB data dictionary. We need to skip not stored fields when calculating correct column number for InnoDB data dictionary. dict_table_get_col_name_for_mysql Remove innobase_match_index_columns Revert incorrect change done on MDEV-7367 innobase_need_rebuild Remove unnecessary rebuild force when column is renamed. innobase_create_index_field_def Calculate InnoDB column number correctly and remove unnecessary column name set. innobase_create_index_def, innobase_create_key_defs Remove unneeded fields parameter. Revert unneeded memset. prepare_inplace_alter_table_dict Remove unneeded col_names parameter index_field_t Remove unneeded col_name member. row_merge_create_index Remove unneeded col_names parameter and resolution. Effected tests: innodb-alter-table : Add test case for MDEV-13668 innodb-alter : Remove MDEV-13668, MDEV-9469 and restore original tests innodb-wl5980-alter : Remove MDEV-13668, MDEV-9469 FIXMEs and restore original tests
MariaDB · Oct 9, 2017 · a8db085 · a8db085
1 parent 4d33c74
commit a8db085
Show file tree

Hide file tree

Showing 18 changed files with 293 additions and 339 deletions.
diff --git a/mysql-test/suite/innodb/r/innodb-alter-table.result b/mysql-test/suite/innodb/r/innodb-alter-table.result
@@ -185,3 +185,51 @@ ticket	CREATE TABLE `ticket` (
   KEY `org_id` (`org_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE ticket;
+CREATE TABLE `t` (
+`id` bigint(20) unsigned NOT NULL auto_increment,
+`d` date NOT NULL, 
+`a` bigint(20) unsigned NOT NULL,
+`b` smallint(5) unsigned DEFAULT NULL,
+PRIMARY KEY (`id`,`d`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs STATS_SAMPLE_PAGES=200
+/*!50500 PARTITION BY RANGE COLUMNS(d)
+(PARTITION p20170913 VALUES LESS THAN ('2017-09-14') ENGINE = InnoDB,
+PARTITION p20170914 VALUES LESS THAN ('2017-09-15') ENGINE = InnoDB,
+PARTITION p20170915 VALUES LESS THAN ('2017-09-16') ENGINE = InnoDB,
+PARTITION p20170916 VALUES LESS THAN ('2017-09-17') ENGINE = InnoDB,
+PARTITION p20170917 VALUES LESS THAN ('2017-09-18') ENGINE = InnoDB,
+PARTITION p99991231 VALUES LESS THAN (MAXVALUE) ENGINE = InnoDB) */;
+insert into t(d,a,b) values ('2017-09-15',rand()*10000,rand()*10);
+insert into t(d,a,b) values ('2017-09-15',rand()*10000,rand()*10);
+replace into t(d,a,b) select '2017-09-15',rand()*10000,rand()*10 from t t1, t t2, t t3, t t4, t t5, t t6, t t7, t t8, t t9, t t10, t t11, t t12, t t13, t t14;
+select count(*) from t where d ='2017-09-15';
+count(*)
+16386
+ALTER TABLE t CHANGE b c smallint(5) unsigned , ADD KEY idx_d_a (d, a);
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `d` date NOT NULL,
+  `a` bigint(20) unsigned NOT NULL,
+  `c` smallint(5) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`,`d`),
+  KEY `idx_d_a` (`d`,`a`)
+) ENGINE=InnoDB AUTO_INCREMENT=16387 DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs STATS_SAMPLE_PAGES=200
+/*!50500 PARTITION BY RANGE  COLUMNS(d)
+(PARTITION p20170913 VALUES LESS THAN ('2017-09-14') ENGINE = InnoDB,
+ PARTITION p20170914 VALUES LESS THAN ('2017-09-15') ENGINE = InnoDB,
+ PARTITION p20170915 VALUES LESS THAN ('2017-09-16') ENGINE = InnoDB,
+ PARTITION p20170916 VALUES LESS THAN ('2017-09-17') ENGINE = InnoDB,
+ PARTITION p20170917 VALUES LESS THAN ('2017-09-18') ENGINE = InnoDB,
+ PARTITION p99991231 VALUES LESS THAN (MAXVALUE) ENGINE = InnoDB) */
+analyze table t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+select count(*) from t where d ='2017-09-15';
+count(*)
+16386
+select count(*) from t force index(primary) where d ='2017-09-15';
+count(*)
+16386
+DROP TABLE t;
diff --git a/mysql-test/suite/innodb/r/innodb-alter.result b/mysql-test/suite/innodb/r/innodb-alter.result
@@ -540,9 +540,35 @@ ERROR 42000: Key column 'c2' doesn't exist in table
 ALTER TABLE t1n ADD INDEX(c2), CHANGE c2 c4 INT, ALGORITHM=COPY;
 ERROR 42000: Key column 'c2' doesn't exist in table
 ALTER TABLE t1n ADD INDEX(c4), CHANGE c2 c4 INT, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY.
+SHOW CREATE TABLE t1n;
+Table	Create Table
+t1n	CREATE TABLE `t1n` (
+  `c1` int(11) NOT NULL DEFAULT '0',
+  `c4` int(11) DEFAULT NULL,
+  `ct` text,
+  `cu` text,
+  PRIMARY KEY (`c1`),
+  KEY `c4` (`c4`),
+  FULLTEXT KEY `ct` (`ct`),
+  FULLTEXT KEY `ct_2` (`ct`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ALTER TABLE t1n CHANGE c2 c4 INT, LOCK=NONE;
+ERROR 42S22: Unknown column 'c2' in 't1n'
+SHOW CREATE TABLE t1n;
+Table	Create Table
+t1n	CREATE TABLE `t1n` (
+  `c1` int(11) NOT NULL DEFAULT '0',
+  `c4` int(11) DEFAULT NULL,
+  `ct` text,
+  `cu` text,
+  PRIMARY KEY (`c1`),
+  KEY `c4` (`c4`),
+  FULLTEXT KEY `ct` (`ct`),
+  FULLTEXT KEY `ct_2` (`ct`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ALTER TABLE t1n ADD INDEX(c4), LOCK=NONE;
+Warnings:
+Note	1831	Duplicate index `c4_2`. This is deprecated and will be disallowed in a future release.
 SHOW CREATE TABLE t1n;
 Table	Create Table
 t1n	CREATE TABLE `t1n` (
@@ -552,16 +578,73 @@ t1n	CREATE TABLE `t1n` (
   `cu` text,
   PRIMARY KEY (`c1`),
   KEY `c4` (`c4`),
+  KEY `c4_2` (`c4`),
   FULLTEXT KEY `ct` (`ct`),
   FULLTEXT KEY `ct_2` (`ct`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ALTER TABLE t1n DROP INDEX c4;
 ALTER TABLE t1n CHANGE c4 c1 INT, ADD INDEX(c1), ALGORITHM=INPLACE;
 ERROR 42S21: Duplicate column name 'c1'
+SHOW CREATE TABLE t1n;
+Table	Create Table
+t1n	CREATE TABLE `t1n` (
+  `c1` int(11) NOT NULL DEFAULT '0',
+  `c4` int(11) DEFAULT NULL,
+  `ct` text,
+  `cu` text,
+  PRIMARY KEY (`c1`),
+  KEY `c4_2` (`c4`),
+  FULLTEXT KEY `ct` (`ct`),
+  FULLTEXT KEY `ct_2` (`ct`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ALTER TABLE t1n CHANGE c4 c11 INT, ADD INDEX(c11), ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY.
+Warnings:
+Note	1831	Duplicate index `c11`. This is deprecated and will be disallowed in a future release.
+SHOW CREATE TABLE t1n;
+Table	Create Table
+t1n	CREATE TABLE `t1n` (
+  `c1` int(11) NOT NULL DEFAULT '0',
+  `c11` int(11) DEFAULT NULL,
+  `ct` text,
+  `cu` text,
+  PRIMARY KEY (`c1`),
+  KEY `c4_2` (`c11`),
+  KEY `c11` (`c11`),
+  FULLTEXT KEY `ct` (`ct`),
+  FULLTEXT KEY `ct_2` (`ct`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ALTER TABLE t1n CHANGE c4 c11 INT, LOCK=NONE;
+ERROR 42S22: Unknown column 'c4' in 't1n'
+SHOW CREATE TABLE t1n;
+Table	Create Table
+t1n	CREATE TABLE `t1n` (
+  `c1` int(11) NOT NULL DEFAULT '0',
+  `c11` int(11) DEFAULT NULL,
+  `ct` text,
+  `cu` text,
+  PRIMARY KEY (`c1`),
+  KEY `c4_2` (`c11`),
+  KEY `c11` (`c11`),
+  FULLTEXT KEY `ct` (`ct`),
+  FULLTEXT KEY `ct_2` (`ct`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 ALTER TABLE t1n ADD INDEX(c11), LOCK=NONE;
+Warnings:
+Note	1831	Duplicate index `c11_2`. This is deprecated and will be disallowed in a future release.
+SHOW CREATE TABLE t1n;
+Table	Create Table
+t1n	CREATE TABLE `t1n` (
+  `c1` int(11) NOT NULL DEFAULT '0',
+  `c11` int(11) DEFAULT NULL,
+  `ct` text,
+  `cu` text,
+  PRIMARY KEY (`c1`),
+  KEY `c4_2` (`c11`),
+  KEY `c11` (`c11`),
+  KEY `c11_2` (`c11`),
+  FULLTEXT KEY `ct` (`ct`),
+  FULLTEXT KEY `ct_2` (`ct`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW CREATE TABLE t1n;
 Table	Create Table
 t1n	CREATE TABLE `t1n` (
@@ -570,7 +653,9 @@ t1n	CREATE TABLE `t1n` (
   `ct` text,
   `cu` text,
   PRIMARY KEY (`c1`),
+  KEY `c4_2` (`c11`),
   KEY `c11` (`c11`),
+  KEY `c11_2` (`c11`),
   FULLTEXT KEY `ct` (`ct`),
   FULLTEXT KEY `ct_2` (`ct`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -640,20 +725,39 @@ CHANGE foo_id FTS_DOC_ID BIGINT UNSIGNED NOT NULL;
 ALTER TABLE t1o DROP INDEX ct, DROP INDEX FTS_DOC_ID_INDEX,
 CHANGE FTS_DOC_ID foo_id BIGINT UNSIGNED NOT NULL;
 ALTER TABLE t1o ADD UNIQUE INDEX FTS_DOC_ID_INDEX(foo_id);
-call mtr.add_suppression("Error: no matching column for .FTS_DOC_ID. in index .ct.--temporary-- of table .test...t1o");
 ALTER TABLE t1o CHANGE foo_id FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
 ADD FULLTEXT INDEX(ct);
-ERROR HY000: Incorrect key file for table 't1o'; try to repair it
+SHOW CREATE TABLE t1o;
+Table	Create Table
+t1o	CREATE TABLE `t1o` (
+  `FTS_DOC_ID` bigint(20) unsigned NOT NULL,
+  `c2` int(11) DEFAULT NULL,
+  `ct` text,
+  `cu` text,
+  PRIMARY KEY (`FTS_DOC_ID`),
+  UNIQUE KEY `FTS_DOC_ID_INDEX` (`FTS_DOC_ID`),
+  FULLTEXT KEY `ct` (`ct`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ALTER TABLE t1o CHANGE FTS_DOC_ID foo_id BIGINT UNSIGNED NOT NULL,
+ALGORITHM=INPLACE;
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Cannot drop or rename FTS_DOC_ID. Try ALGORITHM=COPY.
 DROP TABLE sys_indexes;
 CREATE TABLE sys_indexes SELECT i.* FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES i
 INNER JOIN sys_tables st ON i.TABLE_ID=st.TABLE_ID;
 SELECT i.NAME,i.POS,i.MTYPE,i.PRTYPE,i.LEN
 FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS i
 INNER JOIN sys_tables st ON i.TABLE_ID=st.TABLE_ID;
 NAME	POS	MTYPE	PRTYPE	LEN
+FTS_DOC_ID	0	6	1800	8
+c2	1	6	1027	4
+ct	2	5	524540	10
+cu	3	5	524540	10
 SELECT si.NAME,i.POS,i.NAME FROM INFORMATION_SCHEMA.INNODB_SYS_FIELDS i
 INNER JOIN sys_indexes si ON i.INDEX_ID=si.INDEX_ID;
 NAME	POS	NAME
+PRIMARY	0	FTS_DOC_ID
+FTS_DOC_ID_INDEX	0	FTS_DOC_ID
+ct	0	ct
 SELECT i.* FROM INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS i
 INNER JOIN sys_foreign sf ON i.ID = sf.ID;
 ID	FOR_COL_NAME	REF_COL_NAME	POS

diff --git a/mysql-test/suite/innodb/r/innodb-wl5980-alter.result b/mysql-test/suite/innodb/r/innodb-wl5980-alter.result
@@ -1010,9 +1010,6 @@ ERROR 42000: Key column 'c2' doesn't exist in table
 ALTER TABLE t1n ADD INDEX(c2), CHANGE c2 c4 INT, ALGORITHM=COPY;
 ERROR 42000: Key column 'c2' doesn't exist in table
 ALTER TABLE t1n ADD INDEX(c4), CHANGE c2 c4 INT, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY.
-ALTER TABLE t1n CHANGE c2 c4 INT, LOCK=NONE;
-ALTER TABLE t1n ADD INDEX(c4), LOCK=NONE;
 ### files in MYSQL_DATA_DIR/test
 FTS_AUX_INDEX_1.ibd
 FTS_AUX_INDEX_2.ibd
@@ -1113,9 +1110,6 @@ tt.ibd
 ALTER TABLE t1n CHANGE c4 c1 INT, ADD INDEX(c1), ALGORITHM=INPLACE;
 ERROR 42S21: Duplicate column name 'c1'
 ALTER TABLE t1n CHANGE c4 c11 INT, ADD INDEX(c11), ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY.
-ALTER TABLE t1n CHANGE c4 c11 INT, LOCK=NONE;
-ALTER TABLE t1n ADD INDEX(c11), LOCK=NONE;
 ### files in MYSQL_DATA_DIR/test
 FTS_AUX_INDEX_1.ibd
 FTS_AUX_INDEX_2.ibd
@@ -1201,13 +1195,9 @@ tt.isl
 t1c.ibd
 t1p.ibd
 tt.ibd
-call mtr.add_suppression("Error: no matching column for .FTS_DOC_ID. in index .ct.--temporary-- of table .test...t1o");
 ALTER TABLE t1o ADD FULLTEXT INDEX(ct),
 CHANGE c1 FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
 ALGORITHM=INPLACE;
-ERROR HY000: Incorrect key file for table 't1o'; try to repair it
-ALTER TABLE t1o CHANGE c1 FTS_DOC_ID BIGINT UNSIGNED NOT NULL, LOCK=NONE;
-ALTER TABLE t1o ADD FULLTEXT INDEX(ct), ALGORITHM=INPLACE;
 ### files in MYSQL_DATA_DIR/test
 FTS_AUX_INDEX_1.ibd
 FTS_AUX_INDEX_2.ibd
@@ -1249,6 +1239,9 @@ tt.isl
 t1c.ibd
 t1p.ibd
 tt.ibd
+ALTER TABLE t1o CHANGE FTS_DOC_ID foo_id BIGINT UNSIGNED NOT NULL,
+LOCK=NONE;
+ERROR 0A000: LOCK=NONE is not supported. Reason: Cannot drop or rename FTS_DOC_ID. Try LOCK=SHARED.
 SELECT sc.pos FROM information_schema.innodb_sys_columns sc
 INNER JOIN information_schema.innodb_sys_tables st
 ON sc.TABLE_ID=st.TABLE_ID
@@ -1352,9 +1345,6 @@ tt.isl
 tt.ibd
 ALTER TABLE t1o CHANGE foo_id FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
 ADD FULLTEXT INDEX(ct);
-ERROR HY000: Incorrect key file for table 't1o'; try to repair it
-ALTER TABLE t1o CHANGE foo_id FTS_DOC_ID BIGINT UNSIGNED NOT NULL, LOCK=NONE;
-ALTER TABLE t1o ADD FULLTEXT INDEX(ct), ALGORITHM=INPLACE;
 ### files in MYSQL_DATA_DIR/test
 FTS_AUX_INDEX_1.ibd
 FTS_AUX_INDEX_2.ibd

diff --git a/mysql-test/suite/innodb/t/innodb-alter-table.test b/mysql-test/suite/innodb/t/innodb-alter-table.test
@@ -1,4 +1,5 @@
 --source include/innodb_page_size.inc
+--source include/have_partition.inc
 
 #
 # MMDEV-8386: MariaDB creates very big tmp file and hangs on xtradb
@@ -171,3 +172,39 @@ ALTER TABLE ticket
 SHOW CREATE TABLE ticket;
 
 DROP TABLE ticket;
+
+#
+# MDEV-13838: Wrong result after altering a partitioned table
+#
+
+CREATE TABLE `t` (
+`id` bigint(20) unsigned NOT NULL auto_increment,
+`d` date NOT NULL, 
+`a` bigint(20) unsigned NOT NULL,
+`b` smallint(5) unsigned DEFAULT NULL,
+PRIMARY KEY (`id`,`d`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs STATS_SAMPLE_PAGES=200
+/*!50500 PARTITION BY RANGE COLUMNS(d)
+(PARTITION p20170913 VALUES LESS THAN ('2017-09-14') ENGINE = InnoDB,
+PARTITION p20170914 VALUES LESS THAN ('2017-09-15') ENGINE = InnoDB,
+PARTITION p20170915 VALUES LESS THAN ('2017-09-16') ENGINE = InnoDB,
+PARTITION p20170916 VALUES LESS THAN ('2017-09-17') ENGINE = InnoDB,
+PARTITION p20170917 VALUES LESS THAN ('2017-09-18') ENGINE = InnoDB,
+PARTITION p99991231 VALUES LESS THAN (MAXVALUE) ENGINE = InnoDB) */;
+
+insert into t(d,a,b) values ('2017-09-15',rand()*10000,rand()*10);
+insert into t(d,a,b) values ('2017-09-15',rand()*10000,rand()*10);
+
+replace into t(d,a,b) select '2017-09-15',rand()*10000,rand()*10 from t t1, t t2, t t3, t t4, t t5, t t6, t t7, t t8, t t9, t t10, t t11, t t12, t t13, t t14;
+
+select count(*) from t where d ='2017-09-15';
+
+ALTER TABLE t CHANGE b c smallint(5) unsigned , ADD KEY idx_d_a (d, a);
+SHOW CREATE TABLE t;
+analyze table t;
+
+select count(*) from t where d ='2017-09-15';
+select count(*) from t force index(primary) where d ='2017-09-15';
+
+DROP TABLE t;
+
diff --git a/mysql-test/suite/innodb/t/innodb-alter.test b/mysql-test/suite/innodb/t/innodb-alter.test
@@ -298,21 +298,24 @@ SHOW CREATE TABLE t1n;
 ALTER TABLE t1n ADD INDEX(c2), CHANGE c2 c4 INT, ALGORITHM=INPLACE;
 --error ER_KEY_COLUMN_DOES_NOT_EXITS
 ALTER TABLE t1n ADD INDEX(c2), CHANGE c2 c4 INT, ALGORITHM=COPY;
-# FIXME: MDEV-13668 InnoDB unnecessarily rebuilds table
-# when renaming a column and adding index
---error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
 ALTER TABLE t1n ADD INDEX(c4), CHANGE c2 c4 INT, ALGORITHM=INPLACE;
+SHOW CREATE TABLE t1n;
+--error ER_BAD_FIELD_ERROR
 ALTER TABLE t1n CHANGE c2 c4 INT, LOCK=NONE;
+SHOW CREATE TABLE t1n;
 ALTER TABLE t1n ADD INDEX(c4), LOCK=NONE;
 SHOW CREATE TABLE t1n;
 ALTER TABLE t1n DROP INDEX c4;
 --error ER_DUP_FIELDNAME
 ALTER TABLE t1n CHANGE c4 c1 INT, ADD INDEX(c1), ALGORITHM=INPLACE;
-# FIXME: MDEV-13668
---error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
+SHOW CREATE TABLE t1n;
 ALTER TABLE t1n CHANGE c4 c11 INT, ADD INDEX(c11), ALGORITHM=INPLACE;
+SHOW CREATE TABLE t1n;
+--error ER_BAD_FIELD_ERROR
 ALTER TABLE t1n CHANGE c4 c11 INT, LOCK=NONE;
+SHOW CREATE TABLE t1n;
 ALTER TABLE t1n ADD INDEX(c11), LOCK=NONE;
+SHOW CREATE TABLE t1n;
 
 SHOW CREATE TABLE t1n;
 DROP TABLE t1n;
@@ -370,16 +373,13 @@ CHANGE FTS_DOC_ID foo_id BIGINT UNSIGNED NOT NULL;
 
 ALTER TABLE t1o ADD UNIQUE INDEX FTS_DOC_ID_INDEX(foo_id);
 
-# FIXME: MDEV-9469 'Incorrect key file' on ALTER TABLE
-call mtr.add_suppression("Error: no matching column for .FTS_DOC_ID. in index .ct.--temporary-- of table .test...t1o");
---error ER_NOT_KEYFILE
+#call mtr.add_suppression("Error: no matching column for .FTS_DOC_ID. in index .ct.--temporary-- of table .test...t1o");
 ALTER TABLE t1o CHANGE foo_id FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
 ADD FULLTEXT INDEX(ct);
-# FIXME: MDEV-9469 (enable this)
-#--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
-#ALTER TABLE t1o CHANGE FTS_DOC_ID foo_id BIGINT UNSIGNED NOT NULL,
-#ALGORITHM=INPLACE;
-#end of MDEV-9469 FIXME
+SHOW CREATE TABLE t1o;
+--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
+ALTER TABLE t1o CHANGE FTS_DOC_ID foo_id BIGINT UNSIGNED NOT NULL,
+ALGORITHM=INPLACE;
 
 DROP TABLE sys_indexes;
 CREATE TABLE sys_indexes SELECT i.* FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES i
@@ -440,7 +440,7 @@ SHOW CREATE TABLE t2;
 SHOW CREATE TABLE t1;
 SHOW CREATE TABLE t2;
 DROP TABLE t2, t1;
-
+ 
 --echo #
 --echo # BUG 20029625 - HANDLE_FATAL_SIGNAL (SIG=11) IN
 --echo #                DICT_MEM_TABLE_COL_RENAME_LOW
@@ -494,6 +494,3 @@ eval ALTER TABLE $source_db.t1 DROP INDEX index2, algorithm=inplace;
 eval DROP TABLE $source_db.t1;
 eval DROP DATABASE $source_db;
 eval DROP DATABASE $dest_db;
-
-
-