From: Date: August 22 2007 4:25pm
Subject: bk commit into 6.0-falcon tree (hakank:1.2684) BUG#30564
List-Archive: http://lists.mysql.com/commits/32879
X-Bug: 30564
Message-Id: <20070822142511.1254934B1FF@au0012.local>

Below is the list of changes that have just been committed into a local
6.0-falcon repository of hakan. When hakan 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-22 16:25:02+02:00, hakank@stripped +1 -0
  Fixed Intel/Mac build Bug#30564.

  storage/falcon/IO.cpp@stripped, 2007-08-22 16:24:58+02:00, hakank@stripped +1 -1
    Fixed Intel/Mac build Bug#30564.

# 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:	hakank
# Host:	au0012.local
# Root:	/Users/hakan/work/mysql/mysql-5.1-falcon

--- 1.20/storage/falcon/IO.cpp	2007-08-21 21:39:17 +02:00
+++ 1.21/storage/falcon/IO.cpp	2007-08-22 16:24:58 +02:00
@@ -33,6 +33,7 @@
 #define MKDIR(dir)			mkdir (dir)
 
 #else
+#include <sys/types.h>
 #include <aio.h>
 #include <unistd.h>
 #include <signal.h>
@@ -45,7 +46,6 @@
 #define   LOCK_NB   4    /* don't block when locking */
 #define   LOCK_UN   8    /* unlock */
 #endif
-#include <sys/types.h>
 #include <sys/file.h>
 #define O_BINARY		0
 #define O_RANDOM		0