bk commit into 6.0 tree (jas:1.2607)

From: Jim Starkey <jstarkey(at)mysql.com>
Date: Sun Sep 30 2007 - 14:34:07 EDT

Below is the list of changes that have just been committed into a local 6.0 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@1.2607, 2007-09-30 14:34:02-04:00, jas@fluffy.netfrastructure.com +2 -0   Fix Netfrastructure build.

  storage/falcon/Configuration.cpp@1.3, 2007-09-30 14:33:59-04:00, jas@fluffy.netfrastructure.com +6 -6     Fix Netfrastructure build.

  storage/falcon/IO.cpp@1.2, 2007-09-30 14:33:59-04:00, jas@fluffy.netfrastructure.com +4 -0     Fix Netfrastructure build.

diff -Nrup a/storage/falcon/Configuration.cpp b/storage/falcon/Configuration.cpp
--- a/storage/falcon/Configuration.cpp	2007-09-24 06:56:42 -04:00
+++ b/storage/falcon/Configuration.cpp	2007-09-30 14:33:59 -04:00
@@ -94,14 +94,14 @@ Configuration::Configuration(const char 
 	recordScavengeFloorPct		= 33;
 	recordScavengeThreshold		= (recordMemoryMax * 100) / recordScavengeThresholdPct;
 	recordScavengeFloor			= (recordMemoryMax * 100) / recordScavengeFloorPct;
-	serialLogWindows		= 10;
-	initialAllocation			= getMemorySize(INITIAL_ALLOCATION);
+	serialLogWindows			= 10;
+	initialAllocation			= 0;
 	allocationExtent			= 10;
 	disableFsync				= false;
-	pageCacheSize			= getMemorySize(PAGE_CACHE_MEMORY);
-	indexChillThreshold		= 4 * ONE_MB;
-	recordChillThreshold	= 5 * ONE_MB;
-	maxTransactionBacklog	= MAX_TRANSACTION_BACKLOG;
+	pageCacheSize				= getMemorySize(PAGE_CACHE_MEMORY);
+	indexChillThreshold			= 4 * ONE_MB;
+	recordChillThreshold		= 5 * ONE_MB;
+	maxTransactionBacklog		= MAX_TRANSACTION_BACKLOG;
 	disableFsync				= false;

#endif
 

diff -Nrup a/storage/falcon/IO.cpp b/storage/falcon/IO.cpp
--- a/storage/falcon/IO.cpp	2007-09-20 11:41:45 -04:00
+++ b/storage/falcon/IO.cpp	2007-09-30 14:33:59 -04:00

@@ -37,7 +37,11 @@
#include <aio.h>
#include <unistd.h>
#include <signal.h>

+

+#ifdef STORAGE_ENGINE

#include "config.h"

+#endif
+
#ifdef TARGET_OS_LINUX
#include <linux/unistd.h>
#else

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Received on Sun Sep 30 14:23:42 2007