Commit 0671a012 authored by unknown's avatar unknown

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

into  damien-katzs-computer.local:/Users/dkatz/mysql51


mysys/my_copy.c:
  Auto merged
parents 3a89563e 930912f8
...@@ -110,6 +110,11 @@ int my_copy(const char *from, const char *to, myf MyFlags) ...@@ -110,6 +110,11 @@ int my_copy(const char *from, const char *to, myf MyFlags)
err: err:
if (from_file >= 0) VOID(my_close(from_file,MyFlags)); 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); DBUG_RETURN(-1);
} /* my_copy */ } /* my_copy */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment