diff options
| author | unknown <lenz@mysql.com> | 2005-01-10 16:32:03 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-01-10 16:32:03 +0100 |
| commit | 4399f8931a46d2c28515e0ebe3f6fa9b2cf4b21c (patch) | |
| tree | 6625b2f5d43e7defaf42c78baa4d6463f823a504 /innobase/os | |
| parent | 0b7895b9b14981926c34fbd833aed0d9235da68a (diff) | |
| parent | cc1c4a99ef3f0f6b2bcd3861a91416f3e509d5d7 (diff) | |
| download | mariadb-git-4399f8931a46d2c28515e0ebe3f6fa9b2cf4b21c.tar.gz | |
Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-5.0-build
BitKeeper/etc/gone:
auto-union
innobase/os/os0file.c:
Auto merged
Diffstat (limited to 'innobase/os')
| -rw-r--r-- | innobase/os/os0file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index ed3c0e53c12..cb9801cbc9a 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -1767,7 +1767,7 @@ os_file_flush( #else int ret; -#ifdef HAVE_DARWIN_THREADS +#if defined(HAVE_DARWIN_THREADS) && defined(F_FULLFSYNC) /* Apple has disabled fsync() for internal disk drives in OS X. That caused corruption for a user when he tested a power outage. Let us in OS X use a nonstandard flush method recommended by an Apple |