diff --git a/mysql-test/suite/innodb/r/innodb-alter-table.result b/mysql-test/suite/innodb/r/innodb-alter-table.result
index 2c76a2640e0..514b8b7935f 100644
--- a/mysql-test/suite/innodb/r/innodb-alter-table.result
+++ b/mysql-test/suite/innodb/r/innodb-alter-table.result
@@ -43,3 +43,95 @@ KEY `mdl_courmodu_gro_ix` (`groupingid`)
 # Inserting 2701 rows into the table...
 ALTER TABLE moodle19.mdl_course_modules ADD stefantest LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci AFTER showdescription;
 drop database moodle19;
+use test;
+CREATE TABLE `w_findispmon05u` (
+`atpkey` INT(11) NOT NULL DEFAULT '0',
+`atzo05` INT(11) NULL DEFAULT NULL,
+`pos` BIGINT(21) NULL DEFAULT NULL,
+`f5BnvB` INT(9) NULL DEFAULT NULL,
+`f5atbvb` INT(11) NULL DEFAULT NULL,
+`f5atbwmg` INT(11) NULL DEFAULT NULL,
+`f5pBneu` BIGINT(12) NULL DEFAULT NULL,
+`atbwdt` INT(11) NULL DEFAULT NULL,
+`atbwzt` INT(11) NULL DEFAULT NULL,
+`atbart` VARCHAR(10) NULL DEFAULT NULL
+)
+COLLATE='utf8_general_ci'
+ENGINE=InnoDB;
+ALTER TABLE `w_findispmon05u`
+CHANGE COLUMN `atpkey` `f5atpkey` INT(11) NOT NULL DEFAULT '0' FIRST,
+CHANGE COLUMN `atzo05` `f5atzo05` INT(11) NULL DEFAULT NULL AFTER `f5atpkey`,
+CHANGE COLUMN `atbwdt` `f5atbwdt` INT(11) NULL DEFAULT NULL AFTER `f5pBneu`,
+CHANGE COLUMN `atbwzt` `f5atbwzt` INT(11) NULL DEFAULT NULL AFTER `f5atbwdt`,
+CHANGE COLUMN `atbart` `f5atbart` VARCHAR(10) NULL DEFAULT NULL AFTER `f5atbwzt`,
+ADD INDEX `atpkey` (`f5atpkey`),
+ADD INDEX `inatkey` (`f5atzo05`, `pos`),
+ADD INDEX `pos` (`pos`, `f5atzo05`);
+SHOW WARNINGS;
+Level	Code	Message
+SHOW CREATE TABLE `w_findispmon05u`;
+Table	Create Table
+w_findispmon05u	CREATE TABLE `w_findispmon05u` (
+  `f5atpkey` int(11) NOT NULL DEFAULT '0',
+  `f5atzo05` int(11) DEFAULT NULL,
+  `pos` bigint(21) DEFAULT NULL,
+  `f5BnvB` int(9) DEFAULT NULL,
+  `f5atbvb` int(11) DEFAULT NULL,
+  `f5atbwmg` int(11) DEFAULT NULL,
+  `f5pBneu` bigint(12) DEFAULT NULL,
+  `f5atbwdt` int(11) DEFAULT NULL,
+  `f5atbwzt` int(11) DEFAULT NULL,
+  `f5atbart` varchar(10) DEFAULT NULL,
+  KEY `atpkey` (`f5atpkey`),
+  KEY `inatkey` (`f5atzo05`,`pos`),
+  KEY `pos` (`pos`,`f5atzo05`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+DROP TABLE `w_findispmon05u`;
+CREATE TABLE t (
+a INT NOT NULL,
+b INT NOT NULL,
+PRIMARY KEY (a)
+) ENGINE=INNODB;
+ALTER TABLE t
+CHANGE COLUMN b c INT NOT NULL,
+ADD UNIQUE INDEX (c);
+SHOW WARNINGS;
+Level	Code	Message
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `a` int(11) NOT NULL,
+  `c` int(11) NOT NULL,
+  PRIMARY KEY (`a`),
+  UNIQUE KEY `c` (`c`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ALTER TABLE t
+CHANGE COLUMN c b INT NOT NULL,
+ADD UNIQUE INDEX (c);
+ERROR 42000: Key column 'c' doesn't exist in table
+DROP TABLE t;
+CREATE TABLE parent (
+a INT NOT NULL,
+b INT NOT NULL,
+PRIMARY KEY (a)
+) ENGINE=INNODB;
+CREATE TABLE child (
+a INT NOT NULL,
+b INT NOT NULL,
+PRIMARY KEY (a)
+) ENGINE=INNODB;
+ALTER TABLE child
+CHANGE COLUMN b c INT NOT NULL,
+ADD FOREIGN KEY (c) REFERENCES parent(a);
+SHOW WARNINGS;
+Level	Code	Message
+SHOW CREATE TABLE child;
+Table	Create Table
+child	CREATE TABLE `child` (
+  `a` int(11) NOT NULL,
+  `c` int(11) NOT NULL,
+  PRIMARY KEY (`a`),
+  KEY `c` (`c`),
+  CONSTRAINT `child_ibfk_1` FOREIGN KEY (`c`) REFERENCES `parent` (`a`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE child, parent;
diff --git a/mysql-test/suite/innodb/t/innodb-alter-table.test b/mysql-test/suite/innodb/t/innodb-alter-table.test
index 2be2a30194d..2ad9c8791cb 100644
--- a/mysql-test/suite/innodb/t/innodb-alter-table.test
+++ b/mysql-test/suite/innodb/t/innodb-alter-table.test
@@ -57,3 +57,84 @@ while ($num)
 ALTER TABLE moodle19.mdl_course_modules ADD stefantest LONGTEXT CHARACTER SET utf8 COLLATE utf8_general_ci AFTER showdescription;
 
 drop database moodle19;
+
+#
+# Mdev-9469: Incorrect key file on alter table
+#
+use test;
+
+CREATE TABLE `w_findispmon05u` (
+`atpkey` INT(11) NOT NULL DEFAULT '0',
+`atzo05` INT(11) NULL DEFAULT NULL,
+`pos` BIGINT(21) NULL DEFAULT NULL,
+`f5BnvB` INT(9) NULL DEFAULT NULL,
+`f5atbvb` INT(11) NULL DEFAULT NULL,
+`f5atbwmg` INT(11) NULL DEFAULT NULL,
+`f5pBneu` BIGINT(12) NULL DEFAULT NULL,
+`atbwdt` INT(11) NULL DEFAULT NULL,
+`atbwzt` INT(11) NULL DEFAULT NULL,
+`atbart` VARCHAR(10) NULL DEFAULT NULL
+)
+COLLATE='utf8_general_ci'
+ENGINE=InnoDB;
+ALTER TABLE `w_findispmon05u`
+CHANGE COLUMN `atpkey` `f5atpkey` INT(11) NOT NULL DEFAULT '0' FIRST,
+CHANGE COLUMN `atzo05` `f5atzo05` INT(11) NULL DEFAULT NULL AFTER `f5atpkey`,
+CHANGE COLUMN `atbwdt` `f5atbwdt` INT(11) NULL DEFAULT NULL AFTER `f5pBneu`,
+CHANGE COLUMN `atbwzt` `f5atbwzt` INT(11) NULL DEFAULT NULL AFTER `f5atbwdt`,
+CHANGE COLUMN `atbart` `f5atbart` VARCHAR(10) NULL DEFAULT NULL AFTER `f5atbwzt`,
+ADD INDEX `atpkey` (`f5atpkey`),
+ADD INDEX `inatkey` (`f5atzo05`, `pos`),
+ADD INDEX `pos` (`pos`, `f5atzo05`);
+
+SHOW WARNINGS;
+SHOW CREATE TABLE `w_findispmon05u`;
+
+DROP TABLE `w_findispmon05u`;
+
+CREATE TABLE t (
+        a INT NOT NULL,
+        b INT NOT NULL,
+        PRIMARY KEY (a)
+) ENGINE=INNODB;
+
+ALTER TABLE t
+        CHANGE COLUMN b c INT NOT NULL,
+        ADD UNIQUE INDEX (c);
+
+SHOW WARNINGS;
+SHOW CREATE TABLE t;
+
+# this should fail
+--error 1072
+ALTER TABLE t
+        CHANGE COLUMN c b INT NOT NULL,
+        ADD UNIQUE INDEX (c);
+
+DROP TABLE t;
+
+#
+# Check Foreign Keys
+#
+CREATE TABLE parent (
+        a INT NOT NULL,
+        b INT NOT NULL,
+        PRIMARY KEY (a)
+) ENGINE=INNODB;
+
+CREATE TABLE child (
+        a INT NOT NULL,
+        b INT NOT NULL,
+        PRIMARY KEY (a)
+) ENGINE=INNODB;
+
+ALTER TABLE child
+        CHANGE COLUMN b c INT NOT NULL,
+        ADD FOREIGN KEY (c) REFERENCES parent(a);
+
+SHOW WARNINGS;
+
+SHOW CREATE TABLE child;
+
+DROP TABLE child, parent;
+
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index 49a9c424287..c92be0328f8 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -200,12 +200,14 @@ innobase_fulltext_exist(
 /*******************************************************************//**
 Determine if ALTER TABLE needs to rebuild the table.
 @param ha_alter_info		the DDL operation
+@param altered_table		MySQL original table
 @return whether it is necessary to rebuild the table */
 static __attribute__((nonnull, warn_unused_result))
 bool
 innobase_need_rebuild(
 /*==================*/
-	const Alter_inplace_info*	ha_alter_info)
+	const Alter_inplace_info*	ha_alter_info,
+	const TABLE*			altered_table)
 {
 	if (ha_alter_info->handler_flags
 	    == Alter_inplace_info::CHANGE_CREATE_OPTION
@@ -217,6 +219,34 @@ innobase_need_rebuild(
 		return(false);
 	}
 
+	/* If alter table changes column name and adds a new
+	index, we need to check is this new index created
+	to new column name. This is because column name
+	changes are done normally after creating indexes. */
+	if ((ha_alter_info->handler_flags
+			& Alter_inplace_info::ALTER_COLUMN_NAME) &&
+	    ((ha_alter_info->handler_flags
+		    & Alter_inplace_info::ADD_INDEX) ||
+	     (ha_alter_info->handler_flags
+		     & Alter_inplace_info::ADD_FOREIGN_KEY))) {
+		for (ulint i = 0; i < ha_alter_info->key_count; i++) {
+			const KEY* key = &ha_alter_info->key_info_buffer[
+				ha_alter_info->index_add_buffer[i]];
+
+			for (ulint j = 0; j < key->user_defined_key_parts; j++) {
+				const KEY_PART_INFO*	key_part = &(key->key_part[j]);
+				const Field* field = altered_table->field[key_part->fieldnr];
+
+				/* Field used on added index is renamed on
+				this same alter table. We need table
+				rebuild. */
+				if (field->flags & FIELD_IS_RENAMED) {
+					return (true);
+				}
+			}
+		}
+	}
+	
 	return(!!(ha_alter_info->handler_flags & INNOBASE_ALTER_REBUILD));
 }
 
@@ -531,7 +561,7 @@ ha_innobase::check_if_supported_inplace_alter(
 		operation is possible. */
 	} else if (((ha_alter_info->handler_flags
 		     & Alter_inplace_info::ADD_PK_INDEX)
-		    || innobase_need_rebuild(ha_alter_info))
+			|| innobase_need_rebuild(ha_alter_info, table))
 		   && (innobase_fulltext_exist(altered_table))) {
 		/* Refuse to rebuild the table online, if
 		fulltext indexes are to survive the rebuild. */
@@ -1532,7 +1562,8 @@ innobase_create_index_def(
 	index_def_t*		index,		/*!< out: index definition */
 	mem_heap_t*		heap,		/*!< in: heap where memory
 						is allocated */
-	const Field**		fields)		/*!z in: MySQL table fields */
+	const Field**		fields)		/*!< in: MySQL table fields
+						*/
 {
 	const KEY*	key = &keys[key_number];
 	ulint		i;
@@ -1827,9 +1858,11 @@ innobase_create_key_defs(
 	bool&				add_fts_doc_id,
 			/*!< in: whether we need to add new DOC ID
 			column for FTS index */
-	bool&				add_fts_doc_idx)
+	bool&				add_fts_doc_idx,
 			/*!< in: whether we need to add new DOC ID
 			index for FTS index */
+	const TABLE*			table)
+			/*!< in: MySQL table that is being altered */
 {
 	index_def_t*		indexdef;
 	index_def_t*		indexdefs;
@@ -1879,7 +1912,8 @@ innobase_create_key_defs(
 	}
 
 	const bool rebuild = new_primary || add_fts_doc_id
-		|| innobase_need_rebuild(ha_alter_info);
+		|| innobase_need_rebuild(ha_alter_info, table);
+
 	/* Reserve one more space if new_primary is true, and we might
 	need to add the FTS_DOC_ID_INDEX */
 	indexdef = indexdefs = static_cast<index_def_t*>(
@@ -2716,7 +2750,8 @@ prepare_inplace_alter_table_dict(
 		ctx->heap, ha_alter_info, altered_table, ctx->num_to_add_index,
 		num_fts_index,
 		row_table_got_default_clust_index(ctx->new_table),
-		fts_doc_id_col, add_fts_doc_id, add_fts_doc_id_idx);
+		fts_doc_id_col, add_fts_doc_id, add_fts_doc_id_idx,
+		old_table);
 
 	new_clustered = DICT_CLUSTERED & index_defs[0].ind_type;
 
@@ -2729,7 +2764,7 @@ prepare_inplace_alter_table_dict(
 		/* This is not an online operation (LOCK=NONE). */
 	} else if (ctx->add_autoinc == ULINT_UNDEFINED
 		   && num_fts_index == 0
-		   && (!innobase_need_rebuild(ha_alter_info)
+		   && (!innobase_need_rebuild(ha_alter_info, old_table)
 		       || !innobase_fulltext_exist(altered_table))) {
 		/* InnoDB can perform an online operation (LOCK=NONE). */
 	} else {
@@ -2746,7 +2781,7 @@ prepare_inplace_alter_table_dict(
 	is just copied from old table and stored in indexdefs[0] */
 	DBUG_ASSERT(!add_fts_doc_id || new_clustered);
 	DBUG_ASSERT(!!new_clustered ==
-		    (innobase_need_rebuild(ha_alter_info)
+		    (innobase_need_rebuild(ha_alter_info, old_table)
 		     || add_fts_doc_id));
 
 	/* Allocate memory for dictionary index definitions */
@@ -2996,7 +3031,7 @@ prepare_inplace_alter_table_dict(
 			add_cols, ctx->heap);
 		ctx->add_cols = add_cols;
 	} else {
-		DBUG_ASSERT(!innobase_need_rebuild(ha_alter_info));
+		DBUG_ASSERT(!innobase_need_rebuild(ha_alter_info, old_table));
 
 		if (!ctx->new_table->fts
 		    && innobase_fulltext_exist(altered_table)) {
@@ -3017,7 +3052,7 @@ prepare_inplace_alter_table_dict(
 
 		ctx->add_index[a] = row_merge_create_index(
 			ctx->trx, ctx->new_table,
-			&index_defs[a]);
+			&index_defs[a], ctx->col_names);
 
 		add_key_nums[a] = index_defs[a].key_number;
 
@@ -3862,7 +3897,7 @@ err_exit:
 	if (!(ha_alter_info->handler_flags & INNOBASE_ALTER_DATA)
 	    || (ha_alter_info->handler_flags
 		== Alter_inplace_info::CHANGE_CREATE_OPTION
-		&& !innobase_need_rebuild(ha_alter_info))) {
+		&& !innobase_need_rebuild(ha_alter_info, table))) {
 
 		if (heap) {
 			ha_alter_info->handler_ctx
@@ -4036,7 +4071,7 @@ ok_exit:
 
 	if (ha_alter_info->handler_flags
 	    == Alter_inplace_info::CHANGE_CREATE_OPTION
-	    && !innobase_need_rebuild(ha_alter_info)) {
+	    && !innobase_need_rebuild(ha_alter_info, table)) {
 		goto ok_exit;
 	}
 
diff --git a/storage/innobase/include/row0merge.h b/storage/innobase/include/row0merge.h
index de353d46202..79cbf304722 100644
--- a/storage/innobase/include/row0merge.h
+++ b/storage/innobase/include/row0merge.h
@@ -252,8 +252,11 @@ row_merge_create_index(
 /*===================*/
 	trx_t*			trx,	/*!< in/out: trx (sets error_state) */
 	dict_table_t*		table,	/*!< in: the index is on this table */
-	const index_def_t*	index_def);
+	const index_def_t*	index_def,
 					/*!< in: the index definition */
+	const char**		col_names);
+					/*! in: column names if columns are
+					renamed or NULL */
 /*********************************************************************//**
 Check if a transaction can use an index.
 @return	TRUE if index can be used by the transaction else FALSE */
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc
index 36635c6d035..d1c0bf07637 100644
--- a/storage/innobase/row/row0merge.cc
+++ b/storage/innobase/row/row0merge.cc
@@ -3461,8 +3461,11 @@ row_merge_create_index(
 /*===================*/
 	trx_t*			trx,	/*!< in/out: trx (sets error_state) */
 	dict_table_t*		table,	/*!< in: the index is on this table */
-	const index_def_t*	index_def)
+	const index_def_t*	index_def,
 					/*!< in: the index definition */
+	const char**		col_names)
+					/*! in: column names if columns are
+					renamed or NULL */
 {
 	dict_index_t*	index;
 	dberr_t		err;
@@ -3482,9 +3485,24 @@ row_merge_create_index(
 
 	for (i = 0; i < n_fields; i++) {
 		index_field_t*	ifield = &index_def->fields[i];
-		const char * col_name = ifield->col_name ?
-			dict_table_get_col_name_for_mysql(table, ifield->col_name) :
-			dict_table_get_col_name(table, ifield->col_no);
+		const char * col_name;
+
+		/*
+		Alter table renaming a column and then adding a index
+		to this new name e.g ALTER TABLE t
+		CHANGE COLUMN b c INT NOT NULL, ADD UNIQUE INDEX (c);
+		requires additional check as column names are not yet
+		changed when new index definitions are created. Table's
+		new column names are on a array of column name pointers
+		if any of the column names are changed. */
+
+		if (col_names && col_names[i]) {
+			col_name = col_names[i];
+		} else {
+			col_name = ifield->col_name ?
+				dict_table_get_col_name_for_mysql(table, ifield->col_name) :
+				dict_table_get_col_name(table, ifield->col_no);
+		}
 
 		dict_mem_index_add_field(
 			index,
diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc
index 5235b8f5443..0aa3f917517 100644
--- a/storage/xtradb/handler/handler0alter.cc
+++ b/storage/xtradb/handler/handler0alter.cc
@@ -197,12 +197,14 @@ innobase_fulltext_exist(
 /*******************************************************************//**
 Determine if ALTER TABLE needs to rebuild the table.
 @param ha_alter_info		the DDL operation
+@param altered_table		MySQL original table
 @return whether it is necessary to rebuild the table */
 static __attribute__((nonnull, warn_unused_result))
 bool
 innobase_need_rebuild(
 /*==================*/
-	const Alter_inplace_info*	ha_alter_info)
+	const Alter_inplace_info*	ha_alter_info,
+	const TABLE*			altered_table)
 {
 	if (ha_alter_info->handler_flags
 	    == Alter_inplace_info::CHANGE_CREATE_OPTION
@@ -214,6 +216,34 @@ innobase_need_rebuild(
 		return(false);
 	}
 
+	/* If alter table changes column name and adds a new
+	index, we need to check is this new index created
+	to new column name. This is because column name
+	changes are done normally after creating indexes. */
+	if ((ha_alter_info->handler_flags
+			& Alter_inplace_info::ALTER_COLUMN_NAME) &&
+	    ((ha_alter_info->handler_flags
+		    & Alter_inplace_info::ADD_INDEX) ||
+	     (ha_alter_info->handler_flags
+		     & Alter_inplace_info::ADD_FOREIGN_KEY))) {
+		for (ulint i = 0; i < ha_alter_info->key_count; i++) {
+			const KEY* key = &ha_alter_info->key_info_buffer[
+				ha_alter_info->index_add_buffer[i]];
+
+			for (ulint j = 0; j < key->user_defined_key_parts; j++) {
+				const KEY_PART_INFO*	key_part = &(key->key_part[j]);
+				const Field* field = altered_table->field[key_part->fieldnr];
+
+				/* Field used on added index is renamed on
+				this same alter table. We need table
+				rebuild. */
+				if (field->flags & FIELD_IS_RENAMED) {
+					return (true);
+				}
+			}
+		}
+	}
+	
 	return(!!(ha_alter_info->handler_flags & INNOBASE_ALTER_REBUILD));
 }
 
@@ -529,7 +559,7 @@ ha_innobase::check_if_supported_inplace_alter(
 		operation is possible. */
 	} else if (((ha_alter_info->handler_flags
 		     & Alter_inplace_info::ADD_PK_INDEX)
-		    || innobase_need_rebuild(ha_alter_info))
+			|| innobase_need_rebuild(ha_alter_info, table))
 		   && (innobase_fulltext_exist(altered_table))) {
 		/* Refuse to rebuild the table online, if
 		fulltext indexes are to survive the rebuild. */
@@ -1528,7 +1558,8 @@ innobase_create_index_def(
 	index_def_t*		index,		/*!< out: index definition */
 	mem_heap_t*		heap,		/*!< in: heap where memory
 						is allocated */
-	const Field**		fields)		/*!z in: MySQL table fields */
+	const Field**		fields)		/*!< in: MySQL table fields
+						*/
 {
 	const KEY*	key = &keys[key_number];
 	ulint		i;
@@ -1824,9 +1855,11 @@ innobase_create_key_defs(
 	bool&				add_fts_doc_id,
 			/*!< in: whether we need to add new DOC ID
 			column for FTS index */
-	bool&				add_fts_doc_idx)
+	bool&				add_fts_doc_idx,
 			/*!< in: whether we need to add new DOC ID
 			index for FTS index */
+	const TABLE*			table)
+			/*!< in: MySQL table that is being altered */
 {
 	index_def_t*		indexdef;
 	index_def_t*		indexdefs;
@@ -1876,7 +1909,8 @@ innobase_create_key_defs(
 	}
 
 	const bool rebuild = new_primary || add_fts_doc_id
-		|| innobase_need_rebuild(ha_alter_info);
+		|| innobase_need_rebuild(ha_alter_info, table);
+
 	/* Reserve one more space if new_primary is true, and we might
 	need to add the FTS_DOC_ID_INDEX */
 	indexdef = indexdefs = static_cast<index_def_t*>(
@@ -2714,7 +2748,8 @@ prepare_inplace_alter_table_dict(
 		ctx->heap, ha_alter_info, altered_table, ctx->num_to_add_index,
 		num_fts_index,
 		row_table_got_default_clust_index(ctx->new_table),
-		fts_doc_id_col, add_fts_doc_id, add_fts_doc_id_idx);
+		fts_doc_id_col, add_fts_doc_id, add_fts_doc_id_idx,
+		old_table);
 
 	new_clustered = DICT_CLUSTERED & index_defs[0].ind_type;
 
@@ -2727,7 +2762,7 @@ prepare_inplace_alter_table_dict(
 		/* This is not an online operation (LOCK=NONE). */
 	} else if (ctx->add_autoinc == ULINT_UNDEFINED
 		   && num_fts_index == 0
-		   && (!innobase_need_rebuild(ha_alter_info)
+		   && (!innobase_need_rebuild(ha_alter_info, old_table)
 		       || !innobase_fulltext_exist(altered_table))) {
 		/* InnoDB can perform an online operation (LOCK=NONE). */
 	} else {
@@ -2744,7 +2779,7 @@ prepare_inplace_alter_table_dict(
 	is just copied from old table and stored in indexdefs[0] */
 	DBUG_ASSERT(!add_fts_doc_id || new_clustered);
 	DBUG_ASSERT(!!new_clustered ==
-		    (innobase_need_rebuild(ha_alter_info)
+		    (innobase_need_rebuild(ha_alter_info, old_table)
 		     || add_fts_doc_id));
 
 	/* Allocate memory for dictionary index definitions */
@@ -2994,7 +3029,7 @@ prepare_inplace_alter_table_dict(
 			add_cols, ctx->heap);
 		ctx->add_cols = add_cols;
 	} else {
-		DBUG_ASSERT(!innobase_need_rebuild(ha_alter_info));
+		DBUG_ASSERT(!innobase_need_rebuild(ha_alter_info, old_table));
 
 		if (!ctx->new_table->fts
 		    && innobase_fulltext_exist(altered_table)) {
@@ -3015,7 +3050,7 @@ prepare_inplace_alter_table_dict(
 
 		ctx->add_index[a] = row_merge_create_index(
 			ctx->trx, ctx->new_table,
-			&index_defs[a]);
+			&index_defs[a], ctx->col_names);
 
 		add_key_nums[a] = index_defs[a].key_number;
 
@@ -3869,7 +3904,7 @@ err_exit:
 	if (!(ha_alter_info->handler_flags & INNOBASE_ALTER_DATA)
 	    || (ha_alter_info->handler_flags
 		== Alter_inplace_info::CHANGE_CREATE_OPTION
-		&& !innobase_need_rebuild(ha_alter_info))) {
+		&& !innobase_need_rebuild(ha_alter_info, table))) {
 
 		if (heap) {
 			ha_alter_info->handler_ctx
@@ -4043,7 +4078,7 @@ ok_exit:
 
 	if (ha_alter_info->handler_flags
 	    == Alter_inplace_info::CHANGE_CREATE_OPTION
-	    && !innobase_need_rebuild(ha_alter_info)) {
+	    && !innobase_need_rebuild(ha_alter_info, table)) {
 		goto ok_exit;
 	}
 
diff --git a/storage/xtradb/include/row0merge.h b/storage/xtradb/include/row0merge.h
index de353d46202..79cbf304722 100644
--- a/storage/xtradb/include/row0merge.h
+++ b/storage/xtradb/include/row0merge.h
@@ -252,8 +252,11 @@ row_merge_create_index(
 /*===================*/
 	trx_t*			trx,	/*!< in/out: trx (sets error_state) */
 	dict_table_t*		table,	/*!< in: the index is on this table */
-	const index_def_t*	index_def);
+	const index_def_t*	index_def,
 					/*!< in: the index definition */
+	const char**		col_names);
+					/*! in: column names if columns are
+					renamed or NULL */
 /*********************************************************************//**
 Check if a transaction can use an index.
 @return	TRUE if index can be used by the transaction else FALSE */
diff --git a/storage/xtradb/row/row0merge.cc b/storage/xtradb/row/row0merge.cc
index 1c6cbdbd427..34410204215 100644
--- a/storage/xtradb/row/row0merge.cc
+++ b/storage/xtradb/row/row0merge.cc
@@ -3470,8 +3470,11 @@ row_merge_create_index(
 /*===================*/
 	trx_t*			trx,	/*!< in/out: trx (sets error_state) */
 	dict_table_t*		table,	/*!< in: the index is on this table */
-	const index_def_t*	index_def)
+	const index_def_t*	index_def,
 					/*!< in: the index definition */
+	const char**		col_names)
+					/*! in: column names if columns are
+					renamed or NULL */
 {
 	dict_index_t*	index;
 	dberr_t		err;
@@ -3491,9 +3494,24 @@ row_merge_create_index(
 
 	for (i = 0; i < n_fields; i++) {
 		index_field_t*	ifield = &index_def->fields[i];
-		const char * col_name = ifield->col_name ?
-			dict_table_get_col_name_for_mysql(table, ifield->col_name) :
-			dict_table_get_col_name(table, ifield->col_no);
+		const char * col_name;
+
+		/*
+		Alter table renaming a column and then adding a index
+		to this new name e.g ALTER TABLE t
+		CHANGE COLUMN b c INT NOT NULL, ADD UNIQUE INDEX (c);
+		requires additional check as column names are not yet
+		changed when new index definitions are created. Table's
+		new column names are on a array of column name pointers
+		if any of the column names are changed. */
+
+		if (col_names && col_names[i]) {
+			col_name = col_names[i];
+		} else {
+			col_name = ifield->col_name ?
+				dict_table_get_col_name_for_mysql(table, ifield->col_name) :
+				dict_table_get_col_name(table, ifield->col_no);
+		}
 
 		dict_mem_index_add_field(
 			index,