Merge 10.1 into 10.2

mysql-test/suite/innodb/r/foreign_key.result

@@ -239,6 +239,16 @@ ALTER TABLE t1 ADD FULLTEXT INDEX ft2 (f);
 Warnings:
 Warning	1088	failed to load FOREIGN KEY constraints
 DROP TABLE t1;
+CREATE TABLE t1 (f VARCHAR(256), FTS_DOC_ID BIGINT UNSIGNED PRIMARY KEY)
+ENGINE=InnoDB;
+SET SESSION FOREIGN_KEY_CHECKS = OFF;
+ALTER TABLE t1 ADD FOREIGN KEY (f) REFERENCES non_existing_table (x);
+SET SESSION FOREIGN_KEY_CHECKS = ON;
+ALTER TABLE t1 ADD FULLTEXT INDEX ft1 (f);
+Warnings:
+Warning	1088	failed to load FOREIGN KEY constraints
+ALTER TABLE t1 ADD FULLTEXT INDEX ft2 (f);
+DROP TABLE t1;
 # Start of 10.2 tests
 #
 # MDEV-13246 Stale rows despite ON DELETE CASCADE constraint

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

@@ -221,6 +221,15 @@ ALTER TABLE t1 ADD FULLTEXT INDEX ft1 (f);
 ALTER TABLE t1 ADD FULLTEXT INDEX ft2 (f);
 DROP TABLE t1;
 
+CREATE TABLE t1 (f VARCHAR(256), FTS_DOC_ID BIGINT UNSIGNED PRIMARY KEY)
+ENGINE=InnoDB;
+SET SESSION FOREIGN_KEY_CHECKS = OFF;
+ALTER TABLE t1 ADD FOREIGN KEY (f) REFERENCES non_existing_table (x);
+SET SESSION FOREIGN_KEY_CHECKS = ON;
+ALTER TABLE t1 ADD FULLTEXT INDEX ft1 (f);
+ALTER TABLE t1 ADD FULLTEXT INDEX ft2 (f);
+DROP TABLE t1;
+
 --echo # Start of 10.2 tests
 
 --echo #

storage/innobase/handler/handler0alter.cc

@@ -8872,7 +8872,6 @@ ha_innobase::commit_inplace_alter_table(
 
 			if (!commit_cache_norebuild(ctx, table, trx)) {
 				fk_fail = true;
-				ut_ad(!m_prebuilt->trx->check_foreigns);
 			}
 
 			innobase_rename_or_enlarge_columns_cache(

storage/xtradb/handler/handler0alter.cc

@@ -6181,7 +6181,6 @@ ha_innobase::commit_inplace_alter_table(
 
 			if (!commit_cache_norebuild(ctx, table, trx)) {
 				fk_fail = true;
-				ut_ad(!prebuilt->trx->check_foreigns);
 			}
 
 			innobase_rename_columns_cache(ha_alter_info, table,