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

[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-24 10:37:48-04:00, jas@stripped +2 -0
  Merge jstarkey@stripped:/home/bk/mysql-5.1-falcon
  into  fluffy.netfrastructure.com:/home/mysql/mysql-5.1-falcon
  MERGE: 1.2696.1.2

  storage/falcon/Configuration.cpp@stripped, 2007-08-24 10:37:43-04:00, jas@stripped +0 -0
    Auto merged
    MERGE: 1.25.1.1

  storage/falcon/Record.cpp@stripped, 2007-08-24 10:37:43-04:00, jas@stripped +0 -0
    Auto merged
    MERGE: 1.52.1.1

# 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/RESYNC

--- 1.26/storage/falcon/Configuration.cpp	2007-08-24 10:37:54 -04:00
+++ 1.27/storage/falcon/Configuration.cpp	2007-08-24 10:37:54 -04:00
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(__WIN__)
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 
@@ -258,7 +258,8 @@
 int64 Configuration::getAvailablePhysicalMemory()
 {
 	int64 availableMemory = 0;
-#if defined(__WIN__)
+	
+#ifdef _WIN32
 	MEMORYSTATUSEX stat;
 	DWORD error = 0;
 	

--- 1.53/storage/falcon/Record.cpp	2007-08-24 10:37:54 -04:00
+++ 1.54/storage/falcon/Record.cpp	2007-08-24 10:37:54 -04:00
@@ -925,7 +925,9 @@
 	for (int n = 0;; ++n)
 		try
 			{
-			return new(table->database->recordDataPool) char[length];
+#undef new
+			return POOL_NEW(table->database->recordDataPool) char[length];
+#define new NEW
 			}
 		catch (SQLException& exception)
 			{