diff --git a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
index 340e7cccd97..e15c84c8346 100644
--- a/storage/innodb_plugin/handler/ha_innodb.cc
+++ b/storage/innodb_plugin/handler/ha_innodb.cc
@@ -1140,7 +1140,10 @@ innobase_mysql_tmpfile(void)
 
 	DBUG_ENTER("innobase_mysql_tmpfile");
 
-	DBUG_EXECUTE_IF("innobase_tmpfile_creation_failure", return(-1););
+	DBUG_EXECUTE_IF(
+		"innobase_tmpfile_creation_failure",
+		return(-1);
+	);
 
 	tmpdir = my_tmpdir(&mysql_tmpdir_list);
 
@@ -1203,9 +1206,14 @@ innobase_mysql_tmpfile(void)
 /*========================*/
 {
 	int	fd2 = -1;
-	File	fd = mysql_tmpfile("ib");
+	File	fd;
 
-	DBUG_EXECUTE_IF("innobase_tmpfile_creation_failure", return(-1););
+	DBUG_EXECUTE_IF(
+		"innobase_tmpfile_creation_failure",
+		return(-1);
+	);
+
+	fd = mysql_tmpfile("ib");
 
 	if (fd >= 0) {
 		/* Copy the file descriptor, so that the additional resources