bk commit into 6.0-falcon tree (hakank:1.2523) BUG#28197

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0-falcon 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-05-18 12:33:54+02:00, hakank@stripped +3 -0
  Reviewed fix for Bug#28197.
  
  FALCON_RECORD_CACHE_SUMMARY.FREE_SPACE and
  FALCON_SYSTEM_MEMORY_SUMMARY.FREE_SPACE looks still quite small
  but no integer overruns anymore.

  storage/falcon/MemMgr.cpp@stripped, 2007-05-18 12:33:51+02:00, hakank@stripped +4
-4
    Reviewed fix for Bug#28197.

  storage/falcon/MemMgr.h@stripped, 2007-05-18 12:33:51+02:00, hakank@stripped +2 -2
    Reviewed fix for Bug#28197.

  storage/falcon/ha_falcon.cpp@stripped, 2007-05-18 12:33:51+02:00,
hakank@stripped +4 -4
    Reviewed fix for Bug#28197.

# 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:	hakank
# Host:	lu0011.wdf.sap.corp
# Root:	/home/hakan/work/mysql/mysql-5.1-falcon-28197

--- 1.21/storage/falcon/MemMgr.cpp	2007-05-11 20:50:53 +02:00
+++ 1.22/storage/falcon/MemMgr.cpp	2007-05-18 12:33:51 +02:00
@@ -858,7 +858,7 @@
 			}
 		}
 
-	int freeSpace = 0;
+	int64 freeSpace = 0;
 	int numberFree = 0;
 	int littleSpace = 0;
 
@@ -941,7 +941,7 @@
 			stream->format ("Free blocks:\t");
 
 		int batch = 0;
-		int orderedSpace = 0;
+		int64 orderedSpace = 0;
 		int sizes = 0;
 
 		for (MemFreeBlock *blk = freeBlocks.nextLarger; blk != &freeBlocks; blk =
blk->nextLarger)
@@ -992,8 +992,8 @@
 			}
 		
 		int n = 0;
-		summaryTable->putInt(n++, currentMemory);
-		summaryTable->putInt(n++, freeSpace);
+		summaryTable->putInt64(n++, currentMemory);
+		summaryTable->putInt64(n++, freeSpace);
 		summaryTable->putInt(n++, numberFree);
 		summaryTable->putInt(n++, numberBigHunks);
 		summaryTable->putInt(n++, numberSmallHunks);

--- 1.7/storage/falcon/MemMgr.h	2007-04-23 15:50:35 +02:00
+++ 1.8/storage/falcon/MemMgr.h	2007-05-18 12:33:51 +02:00
@@ -118,8 +118,8 @@
 	MemFreeBlock	freeBlocks;
 	MemFreeBlock	junk;
 	Mutex			mutex;		// Win32 critical regions are faster than SyncObject
-	int				maxMemory;
-	int				currentMemory;
+	int64				maxMemory;
+	int64				currentMemory;
 	int				blocksAllocated;
 	int				blocksActive;
 

--- 1.161/storage/falcon/ha_falcon.cpp	2007-05-17 17:44:32 +02:00
+++ 1.162/storage/falcon/ha_falcon.cpp	2007-05-18 12:33:51 +02:00
@@ -2348,8 +2348,8 @@
 
 ST_FIELD_INFO memorySummaryFieldInfo[]=
 {
-	{"TOTAL_SPACE",		4, MYSQL_TYPE_LONG,		0, 0, "Total Space"},
-	{"FREE_SPACE",		4, MYSQL_TYPE_LONG,		0, 0, "Free Space"},
+	{"TOTAL_SPACE",		4, MYSQL_TYPE_LONGLONG,		0, 0, "Total Space"},
+	{"FREE_SPACE",		4, MYSQL_TYPE_LONGLONG,		0, 0, "Free Space"},
 	{"FREE_SEGMENTS",	4, MYSQL_TYPE_LONG,		0, 0, "Free Segments"},
 	{"BIG_HUNKS",		4, MYSQL_TYPE_LONG,		0, 0, "Big Hunks"},
 	{"SMALL_HUNKS",		4, MYSQL_TYPE_LONG,		0, 0, "Small Hunks"},
@@ -2430,8 +2430,8 @@
 
 ST_FIELD_INFO recordSummaryFieldInfo[]=
 {
-	{"TOTAL_SPACE",		4, MYSQL_TYPE_LONG,		0, 0, "Total Space"},
-	{"FREE_SPACE",		4, MYSQL_TYPE_LONG,		0, 0, "Free Space"},
+	{"TOTAL_SPACE",		4, MYSQL_TYPE_LONGLONG,		0, 0, "Total Space"},
+	{"FREE_SPACE",		4, MYSQL_TYPE_LONGLONG,		0, 0, "Free Space"},
 	{"FREE_SEGMENTS",	4, MYSQL_TYPE_LONG,		0, 0, "Free Segments"},
 	{"BIG_HUNKS",		4, MYSQL_TYPE_LONG,		0, 0, "Big Hunks"},
 	{"SMALL_HUNKS",		4, MYSQL_TYPE_LONG,		0, 0, "Small Hunks"},