From: Date: July 2 2008 10:58pm
Subject: bzr push into mysql-6.0-falcon branch (klong:2726 to 2727) Bug#37749
List-Archive: http://lists.mysql.com/commits/48916
X-Bug: 37749
Message-Id: <200807022058.m62Kw6p3008878@opt8-a.sanuk.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2727 Kelly Long	2008-07-02
      fix 32-bit math overflow -- Bug #37749
modified:
  storage/falcon/SectorBuffer.cpp

 2726 Hakan Kuecuekyilmaz	2008-07-02 [merge]
      Merge something bzr forces me to do so.

=== modified file 'storage/falcon/SectorBuffer.cpp'
--- a/storage/falcon/SectorBuffer.cpp	2008-06-17 21:00:45 +0000
+++ b/storage/falcon/SectorBuffer.cpp	2008-07-02 20:55:11 +0000
@@ -39,7 +39,7 @@ void SectorBuffer::readPage(Bdb* bdb)
 
 void SectorBuffer::readSector()
 {
-	uint64 offset = sectorNumber * cache->pagesPerSector * cache->pageSize;
+	uint64 offset = (uint64)sectorNumber * (uint64)cache->pagesPerSector * (uint64)cache->pageSize;
 	activeLength = dbb->pread(offset, SECTOR_BUFFER_SIZE, buffer);
 }