bk commit into 4.0 tree (heikki:1.2022)

[Heikki Tuuri]

Below is the list of changes that have just been committed into a local
4.0 repository of heikki. When heikki does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2022 04/12/21 18:33:53 heikki@stripped +1 -0
  os0file.c:
    Put back accidentally removed undef and remove a debug def

  innobase/os/os0file.c
    1.80 04/12/21 18:33:45 heikki@stripped +2 -2
    Put back accidentally removed undef and remove a debug def

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	heikki
# Host:	hundin.mysql.fi
# Root:	/home/heikki/mysql-4.0

--- 1.79/innobase/os/os0file.c	Tue Dec 21 18:21:09 2004
+++ 1.80/innobase/os/os0file.c	Tue Dec 21 18:33:45 2004
@@ -6,8 +6,6 @@
 Created 10/21/1995 Heikki Tuuri
 *******************************************************/
 
-#define HAVE_BROKEN_PREAD
-
 #include "os0file.h"
 #include "os0sync.h"
 #include "os0thread.h"
@@ -15,6 +13,8 @@
 #include "srv0srv.h"
 #include "fil0fil.h"
 #include "buf0buf.h"
+
+#undef HAVE_FDATASYNC
 
 #ifdef POSIX_ASYNC_IO
 /* We assume in this case that the OS has standard Posix aio (at least SunOS