Merge mysql-5.1 -> mysql-5.5

3863f513 · Vasil Dimov · 7519cfff · 036079fb · 3863f513
Commit 3863f513 authored Dec 18, 2012 by Vasil Dimov
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.cc +7 -2

No files found.
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -1261,9 +1261,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