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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

2 files changed, 14 insertions, 5 deletions

diff --git a/mysys/my_open.c b/mysys/my_open.c
index ca5c0d8683f..a5cd3811bbf 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.c
@@ -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;
diff --git a/mysys/my_sync.c b/mysys/my_sync.c
index 317ca039346..bd372f03c87 100644
--- a/mysys/my_sync.c
+++ b/mysys/my_sync.c
@@ -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))