diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index b7c6fa98b1c..f19bde12714 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -13024,7 +13024,6 @@ create_table_info_t::create_table_update_dict()
 		if (!innobase_fts_load_stopword(innobase_table, NULL, m_thd)) {
 			dict_table_close(innobase_table, FALSE, FALSE);
 			srv_active_wake_master_thread();
-			trx_free_for_mysql(m_trx);
 			DBUG_RETURN(-1);
 		}
 
@@ -13169,6 +13168,12 @@ ha_innobase::create(
 
 	error = info.create_table_update_dict();
 
+	/* In case of error, free the transaction only if
+	it is newly created transaction in ha_innobase::create() */
+	if (own_trx && error) {
+		trx_free_for_mysql(info.trx());
+	}
+
 	/* Tell the InnoDB server that there might be work for
 	utility threads: */