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-07-20 16:28:40-04:00, jas@rowvwade. +3 -0
Change names of falcon parameters for consistency and
transparency.
storage/falcon/Configuration.cpp@stripped, 2007-07-20 16:28:32-04:00, jas@rowvwade. +3 -3
Change names of falcon parameters for consistency and
transparency.
storage/falcon/Transaction.cpp@stripped, 2007-07-20 16:28:32-04:00, jas@rowvwade. +5 -0
Make sure save points are released as soon as possible.
storage/falcon/ha_falcon.cpp@stripped, 2007-07-20 16:28:33-04:00, jas@rowvwade. +12 -12
Change names of falcon parameters for consistency and
transparency.
# 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.15/storage/falcon/Configuration.cpp 2007-07-20 16:28:59 -04:00
+++ 1.16/storage/falcon/Configuration.cpp 2007-07-20 16:28:59 -04:00
@@ -30,8 +30,8 @@
extern uint64 falcon_min_record_memory;
extern uint64 falcon_max_record_memory;
extern uint64 falcon_page_cache_size;
-extern int falcon_log_mask;
-extern uint falcon_log_windows;
+extern int falcon_debug_mask;
+extern uint falcon_serial_log_buffers;
extern uint falcon_index_chill_threshold;
extern uint falcon_record_chill_threshold;
extern uint falcon_max_transaction_backlog;
@@ -54,7 +54,7 @@
#ifdef STORAGE_ENGINE
recordMemoryLower = falcon_min_record_memory;
recordMemoryUpper = falcon_max_record_memory;
- serialLogWindows = falcon_log_windows;
+ serialLogWindows = falcon_serial_log_buffers;
pageCacheSize = falcon_page_cache_size;
indexChillThreshold = falcon_index_chill_threshold * 1024 * 1024;
recordChillThreshold = falcon_record_chill_threshold * 1024 * 1024;
--- 1.119/storage/falcon/Transaction.cpp 2007-07-20 16:28:59 -04:00
+++ 1.120/storage/falcon/Transaction.cpp 2007-07-20 16:28:59 -04:00
@@ -222,6 +222,8 @@
if (!isActive())
throw SQLEXCEPTION (RUNTIME_ERROR, "transaction is not active");
+ releaseSavePoints();
+
if (!hasUpdates)
{
commitNoUpdates();
@@ -381,6 +383,7 @@
if (!isActive())
throw SQLEXCEPTION (RUNTIME_ERROR, "transaction is not active");
+ releaseSavePoints();
TransactionManager *transactionManager = database->transactionManager;
Transaction *rollbackTransaction = transactionManager->rolledBackTransaction;
state = RolledBack;
@@ -455,6 +458,8 @@
{
if (state != Active)
throw SQLEXCEPTION (RUNTIME_ERROR, "transaction is not active");
+
+ releaseSavePoints();
if ( (xidLength = xidLen) )
{
--- 1.202/storage/falcon/ha_falcon.cpp 2007-07-20 16:28:59 -04:00
+++ 1.203/storage/falcon/ha_falcon.cpp 2007-07-20 16:28:59 -04:00
@@ -73,10 +73,10 @@
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;
+uint falcon_serial_log_buffers;
+char* falcon_serial_log_dir;
+int falcon_debug_mask;
my_bool falcon_debug_server;
-char* falcon_log_dir;
FILE *falcon_log_file;
uint falcon_index_chill_threshold;
uint falcon_record_chill_threshold;
@@ -1812,7 +1812,7 @@
void StorageInterface::logger(int mask, const char* text, void* arg)
{
- if (mask & falcon_log_mask)
+ if (mask & falcon_debug_mask)
{
printf ("%s", text);
@@ -2784,12 +2784,12 @@
"Enable Falcon debug code.",
NULL, NULL, FALSE);
-static MYSQL_SYSVAR_STR(log_dir, falcon_log_dir,
+static MYSQL_SYSVAR_STR(serial_log_dir, falcon_serial_log_dir,
PLUGIN_VAR_RQCMDARG| PLUGIN_VAR_READONLY | PLUGIN_VAR_MEMALLOC,
- "Falcon log file directory.",
+ "Falcon serial log file directory.",
NULL, NULL, NULL);
-static MYSQL_SYSVAR_INT(log_mask, falcon_log_mask,
+static MYSQL_SYSVAR_INT(debug_mask, falcon_debug_mask,
PLUGIN_VAR_RQCMDARG,
"Falcon message type mask for logged messages.",
NULL, NULL, 0, 0, INT_MAX, 0);
@@ -2814,9 +2814,9 @@
"The page size used when creating a Falcon tablespace.",
NULL, NULL, 4096, 1024, 32768, 1024);
-static MYSQL_SYSVAR_UINT(log_windows, falcon_log_windows,
+static MYSQL_SYSVAR_UINT(serial_log_buffers, falcon_serial_log_buffers,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
- "The number of memory windows allocated for Falcon serial log.",
+ "The number of buffers allocated for Falcon serial log.",
NULL, NULL, 10, 10, 32768, 10);
static MYSQL_SYSVAR_UINT(index_chill_threshold, falcon_index_chill_threshold,
@@ -2843,13 +2843,13 @@
static struct st_mysql_sys_var* falconVariables[]= {
MYSQL_SYSVAR(debug_server),
- MYSQL_SYSVAR(log_dir),
- MYSQL_SYSVAR(log_mask),
+ MYSQL_SYSVAR(serial_log_dir),
+ MYSQL_SYSVAR(debug_mask),
MYSQL_SYSVAR(max_record_memory),
MYSQL_SYSVAR(min_record_memory),
MYSQL_SYSVAR(page_cache_size),
MYSQL_SYSVAR(page_size),
- MYSQL_SYSVAR(log_windows),
+ MYSQL_SYSVAR(serial_log_buffers),
MYSQL_SYSVAR(index_chill_threshold),
MYSQL_SYSVAR(record_chill_threshold),
MYSQL_SYSVAR(max_transaction_backlog),
| Thread |
|---|
| • bk commit into 6.0-falcon tree (jas:1.2650) | U-ROWVWADEjas | 20 Jul |
