diff --git a/row/row0mysql.c b/row/row0mysql.c
index a3e2549f517..c3183d05e3f 100644
--- a/row/row0mysql.c
+++ b/row/row0mysql.c
@@ -3441,8 +3441,6 @@ loop:
 
 		err = row_drop_table_for_mysql(table_name, trx, TRUE);
 
-		mem_free(table_name);
-
 		if (err != DB_SUCCESS) {
 			fputs("InnoDB: DROP DATABASE ", stderr);
 			ut_print_name(stderr, trx, TRUE, name);
@@ -3450,8 +3448,11 @@ loop:
 				(ulint) err);
 			ut_print_name(stderr, trx, TRUE, table_name);
 			putc('\n', stderr);
+			mem_free(table_name);
 			break;
 		}
+
+		mem_free(table_name);
 	}
 
 	if (err == DB_SUCCESS) {