Merge damien-katzs-computer.local:/Users/dkatz/mysql50

into  damien-katzs-computer.local:/Users/dkatz/50_frm_files

1 files changed, 6 insertions, 1 deletions

diff --git a/mysys/my_copy.c b/mysys/my_copy.c
index 6143700befc..ec642b4083c 100644
--- a/mysys/my_copy.c
+++ b/mysys/my_copy.c
@@ -111,6 +111,11 @@ int my_copy(const char *from, const char *to, myf MyFlags)
 
 err:
   if (from_file >= 0) VOID(my_close(from_file,MyFlags));
-  if (to_file >= 0)   VOID(my_close(to_file,MyFlags));
+  if (to_file >= 0)
+  {
+    VOID(my_close(to_file, MyFlags));
+    /* attempt to delete the to-file we've partially written */
+    VOID(my_delete(to, MyFlags));
+  }
   DBUG_RETURN(-1);
 } /* my_copy */