bk commit into 6.0 tree (hakank:1.2604)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 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-09-28 18:29:30+02:00, hakank@stripped +1 -0
  Fixed gcc warning.

  storage/falcon/MemMgr.cpp@stripped, 2007-09-28 18:29:22+02:00, hakank@stripped +13 -13
    Fixed gcc warning and while on it fixed white space
    in this method.

diff -Nrup a/storage/falcon/MemMgr.cpp b/storage/falcon/MemMgr.cpp
--- a/storage/falcon/MemMgr.cpp	2007-09-25 07:14:41 +02:00
+++ b/storage/falcon/MemMgr.cpp	2007-09-28 18:29:22 +02:00
@@ -578,10 +578,10 @@ void MemMgr::release(void* object)
 		if (block->pool == NULL)
 			{
 			free(block);	// releaseRaw(block);
-			
+
 			return;
 			}
-			
+
 		block->pool->releaseBlock(block);
 		}
 }
@@ -593,7 +593,7 @@ void MemMgr::releaseBlock(MemBlock *bloc
 
 	if (block->pool->signature != defaultSignature)
 		corrupt("bad block released");
-		
+
 #ifdef MEM_DEBUG
 	for (const UCHAR *end = (UCHAR*) block + ABS(block->length), *p = end - guardBytes; p < end;)
 		if (*p++ != GUARD_BYTE)
@@ -602,9 +602,9 @@ void MemMgr::releaseBlock(MemBlock *bloc
 
 	--blocksActive;
 	int length = block->length;
-	
+
 	// If length is negative, this is a small block
-	
+
 	if (length < 0)
 		{
 		VALGRIND_MAKE_MEM_DEFINED(block, -length);
@@ -622,7 +622,7 @@ void MemMgr::releaseBlock(MemBlock *bloc
 				return;
 			}
 		}
-	
+
 	// OK, this is a large block.  Try recombining with neighbors
 
 	VALGRIND_MAKE_MEM_DEFINED(block, length);
@@ -636,31 +636,31 @@ void MemMgr::releaseBlock(MemBlock *bloc
 	sync.lock(Exclusive);
 	//validateFreeList();
 	block->pool = NULL;
-	ASSERT(length <= activeMemory);
+	ASSERT(length <= (int) activeMemory);
 	activeMemory -= length;
-	
+
 	if (freeBlock->next && !freeBlock->next->memHeader.pool)
 		{
 		MemFreeBlock *next = (MemFreeBlock*) (freeBlock->next);
 		remove (next);
 		freeBlock->memHeader.length += next->memHeader.length + sizeof (MemBigHeader);
-		
+
 		if ( (freeBlock->next = next->next) )
 			freeBlock->next->prior = freeBlock;
 
 		//validateFreeList();
 		}
-	
+
 
 	if (freeBlock->prior && !freeBlock->prior->memHeader.pool)
 		{
 		MemFreeBlock *prior = (MemFreeBlock*) (freeBlock->prior);
 		remove (prior);
 		prior->memHeader.length += freeBlock->memHeader.length + sizeof (MemBigHeader);
-		
+
 		if ( (prior->next = freeBlock->next) )
 			prior->next->prior = prior;
-		
+
 		freeBlock = prior;
 		//validateFreeList();
 		}
@@ -677,7 +677,7 @@ void MemMgr::releaseBlock(MemBlock *bloc
 
 		corrupt("can't find big hunk");
 		}
-			
+
 	insert (freeBlock);
 	//validateFreeList();
 }