From: Date: October 2 2008 11:11am
Subject: bzr push into mysql-6.0-falcon-team branch (olav:2844 to 2845) Bug#39575
List-Archive: http://lists.mysql.com/commits/55027
X-Bug: 39575
Message-Id: <20081002091125.18304.qmail@khepri11>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2845 Olav Sandstaa	2008-10-02
      Fix for Bug#39575 Falcon crashes during loading of large dataset
      
      Changed datatype for the offset within the serial log file from 32 bit to 64 bit
      in order to handle that the serial log file can grow beyond 4 GB.
modified:
  storage/falcon/SerialLogWindow.cpp

 2844 Hakan Kuecuekyilmaz	2008-10-01
      Removed unused
         JString tableSpace = JString::upcase(tableSpaceName);
      
      and while on it also fixed trailing whitespaces.
modified:
  storage/falcon/StorageHandler.cpp

=== modified file 'storage/falcon/SerialLogWindow.cpp'

=== modified file 'storage/falcon/SerialLogWindow.cpp'
--- a/storage/falcon/SerialLogWindow.cpp	2008-03-11 16:15:47 +0000
+++ b/storage/falcon/SerialLogWindow.cpp	2008-10-02 09:01:39 +0000
@@ -117,7 +117,7 @@
 void SerialLogWindow::write(SerialLogBlock *block)
 {
 	uint32 length = ROUNDUP(block->length, sectorSize);
-	uint32 offset = (int) (origin + ((UCHAR*) block - buffer));
+	int64 offset = origin + ((UCHAR*) block - buffer);
 	ASSERT(length <= bufferLength);
 	
 	try