diff --git a/mysql-test/suite/innodb/r/fk_col_alter.result b/mysql-test/suite/innodb/r/fk_col_alter.result
index 21a8f5da334..d58f68977ef 100644
--- a/mysql-test/suite/innodb/r/fk_col_alter.result
+++ b/mysql-test/suite/innodb/r/fk_col_alter.result
@@ -105,4 +105,17 @@ ALTER TABLE t MODIFY f VARCHAR(8);
 ALTER TABLE t MODIFY vf VARCHAR(18);
 ERROR HY000: This is not yet supported for generated columns
 DROP TABLE t;
+#
+#  MDEV-32527 Server aborts during alter operation
+#	when table doesn't have foreign index
+#
+CREATE TABLE t1 (f1 INT NOT NULL, INDEX(f1)) ENGINE=InnoDB;
+CREATE TABLE t2(f1 INT NOT NULL, f2 VARCHAR(100) DEFAULT NULL,
+INDEX idx(f1, f2),
+FOREIGN KEY(f1) REFERENCES t1(f1))ENGINE=INNODB;
+SET SESSION FOREIGN_KEY_CHECKS = OFF;
+ALTER TABLE t2 DROP INDEX idx;
+ALTER TABLE t2 MODIFY f2 VARCHAR(1023);
+SET SESSION FOREIGN_KEY_CHECKS = ON;
+DROP TABLE t2, t1;
 # End of 10.4 tests
diff --git a/mysql-test/suite/innodb/t/fk_col_alter.test b/mysql-test/suite/innodb/t/fk_col_alter.test
index afcea6093b4..6788c825b0f 100644
--- a/mysql-test/suite/innodb/t/fk_col_alter.test
+++ b/mysql-test/suite/innodb/t/fk_col_alter.test
@@ -139,4 +139,18 @@ ALTER TABLE t MODIFY f VARCHAR(8);
 --error ER_UNSUPPORTED_ACTION_ON_GENERATED_COLUMN
 ALTER TABLE t MODIFY vf VARCHAR(18);
 DROP TABLE t;
+
+--echo #
+--echo #  MDEV-32527 Server aborts during alter operation
+--echo #	when table doesn't have foreign index
+--echo #
+CREATE TABLE t1 (f1 INT NOT NULL, INDEX(f1)) ENGINE=InnoDB;
+CREATE TABLE t2(f1 INT NOT NULL, f2 VARCHAR(100) DEFAULT NULL,
+                INDEX idx(f1, f2),
+                FOREIGN KEY(f1) REFERENCES t1(f1))ENGINE=INNODB;
+SET SESSION FOREIGN_KEY_CHECKS = OFF;
+ALTER TABLE t2 DROP INDEX idx;
+ALTER TABLE t2 MODIFY f2 VARCHAR(1023);
+SET SESSION FOREIGN_KEY_CHECKS = ON;
+DROP TABLE t2, t1;
 --echo # End of 10.4 tests
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index eb484281bf2..d3196c47ca2 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -7680,20 +7680,17 @@ bool check_col_is_in_fk_indexes(
 {
   char *fk_id= nullptr;
 
-  for (dict_foreign_set::iterator it= table->foreign_set.begin();
-       it!= table->foreign_set.end();)
+  for (const auto &f : table->foreign_set)
   {
-    if (std::find(drop_fk.begin(), drop_fk.end(), (*it))
-        != drop_fk.end())
-      goto next_item;
-    for (ulint i= 0; i < (*it)->n_fields; i++)
-      if ((*it)->foreign_index->fields[i].col == col)
+    if (!f->foreign_index ||
+        std::find(drop_fk.begin(), drop_fk.end(), f) != drop_fk.end())
+      continue;
+    for (ulint i= 0; i < f->n_fields; i++)
+      if (f->foreign_index->fields[i].col == col)
       {
-	fk_id= (*it)->id;
-	goto err_exit;
+        fk_id= f->id;
+        goto err_exit;
       }
-next_item:
-    it++;
   }
 
   for (const auto &a : add_fk)
@@ -7703,17 +7700,16 @@ next_item:
       if (a->foreign_index->fields[i].col == col)
       {
         fk_id= a->id;
-	goto err_exit;
+        goto err_exit;
       }
     }
   }
 
   for (const auto &f : table->referenced_set)
   {
+    if (!f->referenced_index) continue;
     for (ulint i= 0; i < f->n_fields; i++)
     {
-      if (!f->referenced_index)
-        continue;
       if (f->referenced_index->fields[i].col == col)
       {
         my_error(ER_FK_COLUMN_CANNOT_CHANGE_CHILD, MYF(0),