--- 5.0repos/client/mysql_upgrade.c	2007-04-23 13:27:54.000000000 +0200
+++ mysql-5.0/client/mysql_upgrade.c	2007-06-05 15:42:15.733994500 +0200
@@ -436,13 +436,17 @@
   DBUG_ENTER("run_query");
   DBUG_PRINT("enter", ("query: %s", query));
   if ((fd= create_temp_file(query_file_path, NULL,
-                            "sql", O_CREAT | O_SHARE | O_RDWR,
+                            "sql", O_CREAT | O_SHARE | O_RDWR | _O_SHORT_LIVED,
                             MYF(MY_WME))) < 0)
     die("Failed to create temporary file for defaults");
 
   if (my_write(fd, query, strlen(query),
                MYF(MY_FNABP | MY_WME)))
-    die("Failed to write to '%s'", query_file_path);
+  {
+	my_close(fd, MYF(0));
+	my_delete(query_file_path, MYF(0));
+	die("Failed to write to '%s'", query_file_path);
+  }
 
   ret= run_tool(mysql_path,
                 ds_res,
@@ -457,6 +461,7 @@
                 NULL);
 
   my_close(fd, MYF(0));
+  my_delete(query_file_path, MYF(0));
 
   DBUG_RETURN(ret);
 }