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

[Hakan Kuecuekilmaz]

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-07-23 12:15:04+02:00, hakank@stripped +2 -0
  Adjusted result file.
  Added test for falcon_max_transaction_backlog.

  mysql-test/r/falcon_options.result@stripped, 2007-07-23 12:15:00+02:00, hakank@stripped
+28 -16
    Adjusted result file.

  mysql-test/t/falcon_options.test@stripped, 2007-07-23 12:15:00+02:00, hakank@stripped +17
-10
    Added test for falcon_max_transaction_backlog.

# 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:	au0012.local
# Root:	/Users/hakan/work/mysql/mysql-5.1-falcon

--- 1.7/mysql-test/r/falcon_options.result	2007-07-05 17:31:30 +02:00
+++ 1.8/mysql-test/r/falcon_options.result	2007-07-23 12:15:00 +02:00
@@ -1,26 +1,26 @@
 SHOW VARIABLES LIKE 'falcon_%';
 Variable_name	Value
+falcon_debug_mask	0
 falcon_debug_server	OFF
 falcon_index_chill_threshold	4
-falcon_log_dir	
-falcon_log_mask	0
-falcon_log_windows	10
 falcon_max_record_memory	20971520
 falcon_max_transaction_backlog	10000
 falcon_min_record_memory	0
 falcon_page_cache_size	4194304
 falcon_page_size	4096
 falcon_record_chill_threshold	5
+falcon_serial_log_buffers	10
+falcon_serial_log_dir	
 SELECT @@GLOBAL.falcon_debug_server;
 @@GLOBAL.falcon_debug_server
 0
 SET GLOBAL falcon_debug_server = TRUE;
 ERROR HY000: Variable 'falcon_debug_server' is a read only variable
-SELECT @@GLOBAL.falcon_log_dir;
-@@GLOBAL.falcon_log_dir
+SELECT @@GLOBAL.falcon_serial_log_dir;
+@@GLOBAL.falcon_serial_log_dir
 NULL
-SET GLOBAL falcon_log_dir = '/foo';
-ERROR HY000: Variable 'falcon_log_dir' is a read only variable
+SET GLOBAL falcon_serial_log_dir = '/foo';
+ERROR HY000: Variable 'falcon_serial_log_dir' is a read only variable
 SELECT @@GLOBAL.falcon_max_record_memory;
 @@GLOBAL.falcon_max_record_memory
 20971520
@@ -41,24 +41,36 @@ SELECT @@GLOBAL.falcon_page_size;
 4096
 SET GLOBAL falcon_page_size = 1K;
 ERROR HY000: Variable 'falcon_page_size' is a read only variable
-SELECT @@GLOBAL.falcon_log_mask;
-@@GLOBAL.falcon_log_mask
+SELECT @@GLOBAL.falcon_serial_log_buffers;
+@@GLOBAL.falcon_serial_log_buffers
+10
+SET GLOBAL falcon_serial_log_buffers = 100;
+ERROR HY000: Variable 'falcon_serial_log_buffers' is a read only variable
+SELECT @@GLOBAL.falcon_debug_mask;
+@@GLOBAL.falcon_debug_mask
 0
-SET GLOBAL falcon_log_mask = 4096;
-SELECT @@GLOBAL.falcon_log_mask;
-@@GLOBAL.falcon_log_mask
+SET GLOBAL falcon_debug_mask = 4096;
+SELECT @@GLOBAL.falcon_debug_mask;
+@@GLOBAL.falcon_debug_mask
 4096
+SELECT @@GLOBAL.falcon_max_transaction_backlog;
+@@GLOBAL.falcon_max_transaction_backlog
+10000
+SET GLOBAL falcon_max_transaction_backlog = 10001;
+SELECT @@GLOBAL.falcon_max_transaction_backlog;
+@@GLOBAL.falcon_max_transaction_backlog
+10001
 SELECT * FROM INFORMATION_SCHEMA.global_variables 
 WHERE variable_name LIKE 'falcon%';
 VARIABLE_NAME	VARIABLE_VALUE
+FALCON_DEBUG_MASK	4096
 FALCON_DEBUG_SERVER	OFF
 FALCON_INDEX_CHILL_THRESHOLD	4
-FALCON_LOG_DIR	
-FALCON_LOG_MASK	4096
-FALCON_LOG_WINDOWS	10
 FALCON_MAX_RECORD_MEMORY	20971520
-FALCON_MAX_TRANSACTION_BACKLOG	10000
+FALCON_MAX_TRANSACTION_BACKLOG	10001
 FALCON_MIN_RECORD_MEMORY	0
 FALCON_PAGE_CACHE_SIZE	4194304
 FALCON_PAGE_SIZE	4096
 FALCON_RECORD_CHILL_THRESHOLD	5
+FALCON_SERIAL_LOG_BUFFERS	10
+FALCON_SERIAL_LOG_DIR	

--- 1.2/mysql-test/t/falcon_options.test	2007-05-27 00:26:45 +02:00
+++ 1.3/mysql-test/t/falcon_options.test	2007-07-23 12:15:00 +02:00
@@ -2,15 +2,15 @@
 
 SHOW VARIABLES LIKE 'falcon_%';
 
-# test that these server variables are READ ONLY
+# Test that these server variables are READ ONLY.
 
 SELECT @@GLOBAL.falcon_debug_server;
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
 SET GLOBAL falcon_debug_server = TRUE;
 
-SELECT @@GLOBAL.falcon_log_dir;
+SELECT @@GLOBAL.falcon_serial_log_dir;
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SET GLOBAL falcon_log_dir = '/foo';
+SET GLOBAL falcon_serial_log_dir = '/foo';
 
 SELECT @@GLOBAL.falcon_max_record_memory;
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
@@ -28,14 +28,21 @@ SELECT @@GLOBAL.falcon_page_size;
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
 SET GLOBAL falcon_page_size = 1K;
 
-# This variable is R/W
-SELECT @@GLOBAL.falcon_log_mask;
-SET GLOBAL falcon_log_mask = 4096;
-SELECT @@GLOBAL.falcon_log_mask;
+SELECT @@GLOBAL.falcon_serial_log_buffers;
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET GLOBAL falcon_serial_log_buffers = 100;
+
+# These variables are r/w.
+SELECT @@GLOBAL.falcon_debug_mask;
+SET GLOBAL falcon_debug_mask = 4096;
+SELECT @@GLOBAL.falcon_debug_mask;
 
+SELECT @@GLOBAL.falcon_max_transaction_backlog;
+SET GLOBAL falcon_max_transaction_backlog = 10001;
+SELECT @@GLOBAL.falcon_max_transaction_backlog;
 
-# Test INFORMATION_SCHEMA access to variables
+
+# Test INFORMATION_SCHEMA access to variables.
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.global_variables 
-         WHERE variable_name LIKE 'falcon%';
-
+  WHERE variable_name LIKE 'falcon%';