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

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of . When  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-22 17:06:11-04:00, jas@rowvwade. +2 -0
  Fix trival order of arguments problem in production build.

  storage/falcon/MemMgr.cpp@stripped, 2007-08-22 17:06:03-04:00, jas@rowvwade. +1 -1
    Fix trival order of arguments problem in production build.

  storage/falcon/ha_falcon.h@stripped, 2007-08-22 15:04:47-04:00, jas@rowvwade. +1 -1
    Trivial edit for consistency.

# 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:	rowvwade.
# Root:	D:/MySQL/mysql-5.1-falcon

--- 1.34/storage/falcon/MemMgr.cpp	2007-08-22 17:06:28 -04:00
+++ 1.35/storage/falcon/MemMgr.cpp	2007-08-22 17:06:28 -04:00
@@ -152,7 +152,7 @@
 		recordManager.releaseDebug (record);
 		}
 #else
-	void* MemMgrPoolAllocate (unsigned int s, MemMgr *pool)
+	void* MemMgrPoolAllocate (MemMgr *pool, unsigned int s)
 		{
 		return pool->allocate (s);
 		}

--- 1.48/storage/falcon/ha_falcon.h	2007-08-22 17:06:28 -04:00
+++ 1.49/storage/falcon/ha_falcon.h	2007-08-22 17:06:28 -04:00
@@ -128,6 +128,7 @@
 	static int		rollback_by_xid(handlerton* hton, XID* xid);
 
 	static void		updateFsyncDisable(MYSQL_THD thd, struct st_mysql_sys_var* variable, void
*var_ptr, void *save);
+	static void		updateMaxRecordMemory(MYSQL_THD thd, struct st_mysql_sys_var* variable,
void* var_ptr, void* save);
 
 	/* Turn off table cache for now */
 
@@ -155,7 +156,6 @@
 	key_range			startKey;
 	key_range			endKey;
 	uint64				insertCount;
-	static void updateMaxRecordMemory(MYSQL_THD thd, struct st_mysql_sys_var* variable,
void* var_ptr, void* save);
 };
 
 class NfsPluginHandler