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

[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-05-30 15:00:02-04:00, jas@stripped +1 -0
  Merge jstarkey@stripped:/home/bk/mysql-5.1-falcon
  into  fluffy.netfrastructure.com:/home/mysql/mysql-5.1-falcon
  MERGE: 1.2517.1.11

  storage/falcon/ha_falcon.cpp@stripped, 2007-05-30 14:59:57-04:00,
jas@stripped +0 -0
    Auto merged
    MERGE: 1.172.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.173/storage/falcon/ha_falcon.cpp	2007-05-30 15:00:09 -04:00
+++ 1.174/storage/falcon/ha_falcon.cpp	2007-05-30 15:00:09 -04:00
@@ -66,6 +66,7 @@
 unsigned long long		falcon_max_record_memory; // = 20 * 1024 * 1024;
 unsigned long long		falcon_page_cache_size; // = 2097152;
 uint			falcon_page_size; // = 4096;
+uint			falcon_log_windows;
 int				falcon_log_mask;
 my_bool			falcon_debug_server;
 char*			falcon_log_dir;
@@ -2748,6 +2749,11 @@
   "The page size used when creating a Falcon tablespace.",
   NULL, NULL, 4096, 1024, 32768, 1024);
 
+static MYSQL_SYSVAR_UINT(log_windows, falcon_log_windows,
+  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
+  "The number of memory windows allocated for Falcon serial log.",
+  NULL, NULL, 10, 100, 32768, 10);
+
 static struct st_mysql_sys_var* falconVariables[]= {
 	MYSQL_SYSVAR(debug_server),
 	MYSQL_SYSVAR(log_dir),
@@ -2756,6 +2762,7 @@
 	MYSQL_SYSVAR(min_record_memory),
 	MYSQL_SYSVAR(page_cache_size),
 	MYSQL_SYSVAR(page_size),
+	MYSQL_SYSVAR(log_windows),
 	NULL
 };