Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1-clean

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
a4eb7490 · unknown · 87e1a296 · cc1c4a99 · a4eb7490 · a4eb7490
Commit a4eb7490 authored Jan 10, 2005 by unknown
Expand all Show whitespace changes
Inline Side-by-side

Showing with 236 additions and 1 deletion

BitKeeper/etc/gone BitKeeper/etc/gone +235 -0

innobase/os/os0file.c innobase/os/os0file.c +1 -1

No files found.
--- a/BitKeeper/etc/gone
+++ b/BitKeeper/etc/gone
--- a/innobase/os/os0file.c
+++ b/innobase/os/os0file.c
@@ -1763,7 +1763,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