bk commit into 6.0-falcon tree (jas:1.2696)

[Jim Starkey]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of jas. When jas 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-08-23 12:55:22-04:00, jas@stripped +2 -0
  Actually force scavenging when forcing scavenging (duh!).

  storage/falcon/Database.cpp@stripped, 2007-08-23 12:55:18-04:00, jas@stripped +1 -2
    Actually force record scavenging when forcing a record
    scavenge.

  storage/falcon/MemoryManager.h@stripped, 2007-08-23 12:55:18-04:00, jas@stripped +13 -0
    Added a new more "operator new" to handle pool based array
    allocation.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jas
# Host:	fluffy.netfrastructure.com
# Root:	/home/mysql/mysql-5.1-falcon

--- 1.95/storage/falcon/Database.cpp	2007-08-23 12:55:30 -04:00
+++ 1.96/storage/falcon/Database.cpp	2007-08-23 12:55:30 -04:00
@@ -1724,8 +1724,7 @@
 	// a significant amount of memory since the last cycle, don't bother
 	// bumping the age group.
 
-	//if (total > scavengeThreshold)//recordMemoryUpper)
-	if (total > recordMemoryUpper)
+	if (forced || total > recordMemoryUpper)
 		{
 		printRecordMemory (threshold, total);
 		Sync sync (&syncTables, "Database::retireRecords");

--- 1.11/storage/falcon/MemoryManager.h	2007-08-23 12:55:30 -04:00
+++ 1.12/storage/falcon/MemoryManager.h	2007-08-23 12:55:30 -04:00
@@ -57,9 +57,16 @@
 
 	WINSTATIC ALWAYS_INLINE void* operator new(size_t s, MemMgr *pool) THROWS_BAD_ALLOC
 		{ return MemMgrPoolAllocateDebug (pool, (unsigned int) s, __FILE__, __LINE__); }
+
 	WINSTATIC ALWAYS_INLINE void* operator new(size_t s, MemMgr *pool, const char *file, int line) 
 		{ return MemMgrPoolAllocateDebug (pool, (unsigned int) s, file, line); }
 		
+	WINSTATIC ALWAYS_INLINE void* operator new[](size_t s, MemMgr *pool) THROWS_BAD_ALLOC
+		{ return MemMgrPoolAllocateDebug (pool, (unsigned int) s, __FILE__, __LINE__); }
+
+	WINSTATIC ALWAYS_INLINE void* operator new[](size_t s, MemMgr *pool, const char *file, int line) 
+		{ return MemMgrPoolAllocateDebug (pool, (unsigned int) s, file, line); }
+		
 #define new(arg) new(arg, THIS_FILE, __LINE__)
 #define NEW	new (THIS_FILE, __LINE__)
 #ifndef new
@@ -72,10 +79,16 @@
 	
 	WINSTATIC ALWAYS_INLINE void* operator new(size_t s) THROWS_BAD_ALLOC
 		{ return ::MemMgrAllocate (s); }
+
 	WINSTATIC ALWAYS_INLINE void* operator new(size_t s, MemMgr *pool) THROWS_BAD_ALLOC
 		{ return ::MemMgrPoolAllocate (pool, s); }
+
+	WINSTATIC ALWAYS_INLINE void* operator new[](size_t s, MemMgr *pool) THROWS_BAD_ALLOC
+		{ return ::MemMgrPoolAllocate (pool, s); }
+
 	WINSTATIC ALWAYS_INLINE void* operator new(size_t s, const int  &n) THROWS_BAD_ALLOC
 		{ return ::MemMgrAllocate (s); }
+
 	WINSTATIC ALWAYS_INLINE void* operator new[](size_t s) THROWS_BAD_ALLOC
 		{ return ::MemMgrAllocate (s); }
 #define NEW new