bk commit into 6.0-falcon tree (hakank:1.2708)

[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-08-25 19:11:29+02:00, hakank@stripped +2 -0
  Fixed two gcc warnings of type:
      comparison between signed and unsigned integer expressions.

  storage/falcon/Configuration.cpp@stripped, 2007-08-25 19:11:25+02:00,
hakank@stripped +2 -2
    Fixed two gcc warnings of type:
        comparison between signed and unsigned integer expressions.

  storage/falcon/Configuration.h@stripped, 2007-08-25 19:11:25+02:00,
hakank@stripped +2 -2
    Fixed two gcc warnings of type:
        comparison between signed and unsigned integer expressions.

# 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

--- 1.28/storage/falcon/Configuration.cpp	2007-08-25 01:14:02 +02:00
+++ 1.29/storage/falcon/Configuration.cpp	2007-08-25 19:11:25 +02:00
@@ -326,7 +326,7 @@
 	throw SQLEXCEPTION (DDL_ERROR, "unknown enable value \"%s\"", (const char*) string);
 }
 
-void Configuration::setRecordScavengeThreshold(int threshold)
+void Configuration::setRecordScavengeThreshold(uint64 threshold)
 {
 	recordScavengeThresholdPct = MAX(threshold, MIN_SCAVENGE_THRESHOLD);
 	recordScavengeThreshold = (recordMemoryMax * recordScavengeThresholdPct) / 100;
@@ -337,7 +337,7 @@
 #endif
 }
 
-void Configuration::setRecordScavengeFloor(int floor)
+void Configuration::setRecordScavengeFloor(uint64 floor)
 {
 	recordScavengeFloorPct = MAX(floor, MIN_SCAVENGE_FLOOR);
 	recordScavengeFloor	= (recordScavengeThreshold * recordScavengeFloorPct) / 100;

--- 1.14/storage/falcon/Configuration.h	2007-08-25 01:14:02 +02:00
+++ 1.15/storage/falcon/Configuration.h	2007-08-25 19:11:25 +02:00
@@ -36,8 +36,8 @@
 	int64		getMemorySize(const char *string);
 	int64		getAvailablePhysicalMemory();
 	bool		getLine(void *file, int length, char *line);
-	void		setRecordScavengeThreshold(int threshold);
-	void		setRecordScavengeFloor(int floor);
+	void		setRecordScavengeThreshold(uint64 threshold);
+	void		setRecordScavengeFloor(uint64 floor);
 	void		setRecordMemoryMax(uint64 value);
 
 	JString		classpath;