bzr commit into mysql-6.0-falcon-team branch (klewis:2898)

[Kevin Lewis]

#At file:///C:/Work/bzr/Merge/mysql-6.0-falcon-team/

 2898 Kevin Lewis	2008-11-02
      Code cleanup
modified:
  storage/falcon/MemMgr.cpp
  storage/falcon/SerialLogFile.cpp

per-file messages:
  storage/falcon/MemMgr.cpp
    Code cleanup
  storage/falcon/SerialLogFile.cpp
    Code cleanup
=== modified file 'storage/falcon/MemMgr.cpp'
--- a/storage/falcon/MemMgr.cpp	2008-10-31 15:42:42 +0000
+++ b/storage/falcon/MemMgr.cpp	2008-11-03 00:34:05 +0000
@@ -349,8 +349,7 @@ MemMgr::~MemMgr(void)
 MemBlock* MemMgr::alloc(size_t s)
 {
 	if (s > INT_MAX)
-		throw SQLError (RUNTIME_ERROR, "illegal memory allocate for " I64FORMAT " bytes",
-		(int64)s);
+		throw SQLError (RUNTIME_ERROR, "illegal memory allocate for " I64FORMAT " bytes", (int64)s);
 
 	int length = (int) s;
 

=== modified file 'storage/falcon/SerialLogFile.cpp'
--- a/storage/falcon/SerialLogFile.cpp	2008-10-31 15:42:42 +0000
+++ b/storage/falcon/SerialLogFile.cpp	2008-11-03 00:34:05 +0000
@@ -367,7 +367,7 @@ void SerialLogFile::zap()
 	// The error is supposedly related to the file size being less than 
 	// page size, so initial size is made 8K just in case we'll ever run on IA64
 	size_t initialSize = MAX(sectorSize, 8192); 
-	UCHAR *junk = new UCHAR[initialSize +sectorSize];
+	UCHAR *junk = new UCHAR[initialSize + sectorSize];
 	UCHAR *buffer = ALIGN(junk, sectorSize);
 	memset(buffer, 0, initialSize);
 	write(0, (uint32) initialSize, (SerialLogBlock*) buffer);