mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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:
serg@serg.mylan 2005-01-18 15:17:01 +01:00
commit bc78c1f296
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()
fd File sescriptor
myf Special Flags
*/
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));
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));
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_PRINT("my",("Fd: %d my_flags: %d", fd, my_flags));
do
{
#if defined(HAVE_FDATASYNC)
res= fdatasync(fd);
res= fdatasync(fd);
#elif defined(HAVE_FSYNC)
res=fsync(fd);
res= fsync(fd);
#elif defined(__WIN__)
res= _commit(fd);
#else
res= 0; /* No sync (strange OS) */
res= 0; /* No sync (strange OS) */
#endif
} while (res == -1 && errno == EINTR);
if (res)
{
if (!(my_errno= errno))