Merge branch '5.5' into 10.0

1 files changed, 3 insertions, 17 deletions

diff --git a/mysys/my_create.c b/mysys/my_create.c
index 51de343d4a1..32ad3d44a7a 100644
--- a/mysys/my_create.c
+++ b/mysys/my_create.c
@@ -36,7 +36,7 @@
 File my_create(const char *FileName, int CreateFlags, int access_flags,
 	       myf MyFlags)
 {
-  int fd, rc;
+  int fd;
   DBUG_ENTER("my_create");
   DBUG_PRINT("my",("Name: '%s' CreateFlags: %d  AccessFlags: %d  MyFlags: %lu",
 		   FileName, CreateFlags, access_flags, MyFlags));
@@ -54,21 +54,7 @@ File my_create(const char *FileName, int CreateFlags, int access_flags,
     fd= -1;
   }
 
-  rc= my_register_filename(fd, FileName, FILE_BY_CREATE,
+  fd= my_register_filename(fd, FileName, FILE_BY_CREATE,
                            EE_CANTCREATEFILE, MyFlags);
-  /*
-    my_register_filename() may fail on some platforms even if the call to
-    *open() above succeeds. In this case, don't leave the stale file because
-    callers assume the file to not exist if my_create() fails, so they don't
-    do any cleanups.
-  */
-  if (unlikely(fd >= 0 && rc < 0))
-  {
-    int tmp= my_errno;
-    my_close(fd, MyFlags);
-    my_delete(FileName, MyFlags);
-    my_errno= tmp;
-  }
-  
-  DBUG_RETURN(rc);
+  DBUG_RETURN(fd);
 } /* my_create */