1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge kaamos.(none):/data/src/opt/bug31781/my50

Browse Source 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
This commit is contained in:
kaa@kaamos.(none) 2008-03-03 19:48:00 +03:00
commit 232e9d3cb9
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mysys/my_create.c
View File

@ -35,7 +35,7 @@
File my_create(const char *FileName, int CreateFlags, int access_flags, File my_create(const char *FileName, int CreateFlags, int access_flags,
myf MyFlags) myf MyFlags)
{ {
int fd; int fd, rc;
DBUG_ENTER("my_create"); DBUG_ENTER("my_create");
DBUG_PRINT("my",("Name: '%s' CreateFlags: %d AccessFlags: %d MyFlags: %d", DBUG_PRINT("my",("Name: '%s' CreateFlags: %d AccessFlags: %d MyFlags: %d",
FileName, CreateFlags, access_flags, MyFlags)); FileName, CreateFlags, access_flags, MyFlags));
@ -60,6 +60,20 @@ File my_create(const char *FileName, int CreateFlags, int access_flags,
fd = open(FileName, access_flags); fd = open(FileName, access_flags);
#endif #endif
DBUG_RETURN(my_register_filename(fd, FileName, FILE_BY_CREATE, rc= my_register_filename(fd, FileName, FILE_BY_CREATE,
EE_CANTCREATEFILE, MyFlags)); 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_delete(FileName, MyFlags);
my_errno= tmp;
}
DBUG_RETURN(rc);
} /* my_create */ } /* my_create */