Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-4.1/mysql-4.1-ndb-bj

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-4.1/mysql-4.1-bug21858

1 files changed, 15 insertions, 3 deletions

diff --git a/ndb/src/common/util/File.cpp b/ndb/src/common/util/File.cpp
index 12626f29e7d..00741d3a576 100644
--- a/ndb/src/common/util/File.cpp
+++ b/ndb/src/common/util/File.cpp
@@ -123,13 +123,25 @@ bool
 File_class::close()
 {
   bool rc = true;
+  int retval = 0;
+
   if (m_file != NULL)
   { 
     ::fflush(m_file);
-    rc = (::fclose(m_file) == 0 ? true : false);
-    m_file = NULL; // Try again?
+    retval = ::fclose(m_file);
+    while ( (retval != 0) && (errno == EINTR) ){
+      retval = ::fclose(m_file);
+    }
+    if( retval == 0){
+      rc = true;
+    }
+    else {
+      rc = false;
+      ndbout_c("ERROR: Close file error in File.cpp for %s",strerror(errno));
+    }
   }  
-  
+  m_file = NULL;  
+
   return rc;
 }