From: Date: May 9 2008 10:15pm
Subject: bk commit into 6.0 tree (klewis:1.2672) BUG#36636
List-Archive: http://lists.mysql.com/commits/46582
X-Bug: 36636
Message-Id: <200805092015.m49KFE9E021250@mail.mysql.com>

Below is the list of changes that have just been committed into a local
6.0 repository of klewis.  When klewis 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, 2008-05-09 15:14:24-05:00, klewis@klewis-mysql. +1 -0
  Bug#36636 - Move fsync out of the #ifdef HAVE_PREAD scope so that it works in either case.

  storage/falcon/SerialLogFile.cpp@stripped, 2008-05-09 15:14:13-05:00, klewis@klewis-mysql. +2 -2
    Bug#36636 - Move fsync out of the #ifdef HAVE_PREAD scope so that it works in either case.

diff -Nrup a/storage/falcon/SerialLogFile.cpp b/storage/falcon/SerialLogFile.cpp
--- a/storage/falcon/SerialLogFile.cpp	2008-03-11 10:16:31 -05:00
+++ b/storage/falcon/SerialLogFile.cpp	2008-05-09 15:14:13 -05:00
@@ -219,14 +219,14 @@ void SerialLogFile::write(int64 position
 		if (loc != position)
 			throw SQLEXCEPTION (IO_ERROR, "serial lseek error on \"%s\": %s (%d)", 
 								(const char*) fileName, strerror (errno), errno);
-
 		}
 
 	uint32 n = ::write(handle, data, effectiveLength);
 	
+#endif
+
 	if (forceFsync)
 		fsync(handle);
-#endif
 
 	if (n != effectiveLength)
 		{