[Commits] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2897)

9 Aug 2010

#At lp:maria based on revid:monty@mysql.com-20100809170542-ewa2awm6pcoi1ipy

 2897 Michael Widenius	2010-08-09
      Ignore ENOLCK errno from FreeBSD (known problem in old FreeBSD releases)
      modified:
        mysys/my_sync.c

=== modified file 'mysys/my_sync.c'

--- a/mysys/my_sync.c	2010-08-09 17:05:42 +0000
+++ b/mysys/my_sync.c	2010-08-09 17:54:58 +0000
@@ -68,6 +68,8 @@ int my_sync(File fd, myf my_flags)
     res= fdatasync(fd);
 #elif defined(HAVE_FSYNC)
     res= fsync(fd);
+    if (res == -1 and errno == ENOLCK)
+      res= 0;                                   /* Result Bug in Old FreeBSD */
 #elif defined(__WIN__)
     res= _commit(fd);
 #else

    