diff options
| author | Michael Widenius <monty@mysql.com> | 2010-08-10 16:35:08 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2010-08-10 16:35:08 +0300 |
| commit | f458432f6869a329d4f0db2c3ff26accee5148a8 (patch) | |
| tree | 56c36144fd1fa548a7a865145255cb706baad2c5 /mysys | |
| parent | 06a457229715a6d124fe0381293dce42013aa258 (diff) | |
| parent | 8312aa9ba9387869038203200c9fb1490e3a4512 (diff) | |
| download | mariadb-git-f458432f6869a329d4f0db2c3ff26accee5148a8.tar.gz | |
Merge with 5.1 to get in critical bug fix that caused Aria tests to fail
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_sync.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/my_sync.c b/mysys/my_sync.c index 9f6c55f4fb6..cb0f5794b2e 100644 --- a/mysys/my_sync.c +++ b/mysys/my_sync.c @@ -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 |