Commit 7eb825a0 authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0
parents 7d358a01 91c3487c

mysys/my_open.c

+7 −2
Original line number Diff line number Diff line
@@ -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;

mysys/my_sync.c

+7 −3
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 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);

#elif defined(HAVE_FSYNC)
@@ -49,6 +51,8 @@ int my_sync(File fd, myf my_flags) 
#else

    res= 0;					/* No sync (strange OS) */

#endif

  } while (res == -1 && errno == EINTR);



  if (res)

  {

    if (!(my_errno= errno))