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

Merge bk-internal:/home/bk/mysql-5.0

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
This commit is contained in:
unknown 2005-01-24 18:06:01 +01:00
commit 7eb825a072
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysys/my_open.c
View File

@ -69,7 +69,7 @@ File my_open(const char *FileName, int Flags, myf MyFlags)
my_close() my_close()
fd File sescriptor fd File sescriptor
myf Special Flags myf Special Flags
*/ */
int my_close(File fd, myf MyFlags) int my_close(File fd, myf MyFlags)
@ -79,7 +79,12 @@ int my_close(File fd, myf MyFlags)
DBUG_PRINT("my",("fd: %d MyFlags: %d",fd, MyFlags)); DBUG_PRINT("my",("fd: %d MyFlags: %d",fd, MyFlags));
pthread_mutex_lock(&THR_LOCK_open); pthread_mutex_lock(&THR_LOCK_open);
if ((err = close(fd))) do
{
err= close(fd);
} while (err == -1 && errno == EINTR);
if (err)
{ {
DBUG_PRINT("error",("Got error %d on close",err)); DBUG_PRINT("error",("Got error %d on close",err));
my_errno=errno; my_errno=errno;

10
mysys/my_sync.c
View File

@ -40,15 +40,19 @@ int my_sync(File fd, myf my_flags)
DBUG_ENTER("my_sync"); DBUG_ENTER("my_sync");
DBUG_PRINT("my",("Fd: %d my_flags: %d", fd, my_flags)); DBUG_PRINT("my",("Fd: %d my_flags: %d", fd, my_flags));
do
{
#if defined(HAVE_FDATASYNC) #if defined(HAVE_FDATASYNC)
res= fdatasync(fd); res= fdatasync(fd);
#elif defined(HAVE_FSYNC) #elif defined(HAVE_FSYNC)
res=fsync(fd); res= fsync(fd);
#elif defined(__WIN__) #elif defined(__WIN__)
res= _commit(fd); res= _commit(fd);
#else #else
res= 0; /* No sync (strange OS) */ res= 0; /* No sync (strange OS) */
#endif #endif
} while (res == -1 && errno == EINTR);
if (res) if (res)
{ {
if (!(my_errno= errno)) if (!(my_errno= errno))