Commit 68eb5183 authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com

Merge mysqldev@production.mysql.com:my/mysql-5.1-release

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
parents db9128f8 1b7e33d8
...@@ -2678,7 +2678,8 @@ private: ...@@ -2678,7 +2678,8 @@ private:
UintR cfirstfreeLogFile; UintR cfirstfreeLogFile;
UintR clogFileFileSize; UintR clogFileFileSize;
#define ZLFO_FILE_SIZE 256 /* MAX 256 OUTSTANDING FILE OPERATIONS */ #define ZLFO_MIN_FILE_SIZE 256
// RedoBuffer/32K minimum ZLFO_MIN_FILE_SIZE
LogFileOperationRecord *logFileOperationRecord; LogFileOperationRecord *logFileOperationRecord;
LogFileOperationRecordPtr lfoPtr; LogFileOperationRecordPtr lfoPtr;
UintR cfirstfreeLfo; UintR cfirstfreeLfo;
...@@ -2695,7 +2696,7 @@ private: ...@@ -2695,7 +2696,7 @@ private:
UintR cfirstfreePageRef; UintR cfirstfreePageRef;
UintR cpageRefFileSize; UintR cpageRefFileSize;
#define ZSCANREC_FILE_SIZE 100 // Configurable
ArrayPool<ScanRecord> c_scanRecordPool; ArrayPool<ScanRecord> c_scanRecordPool;
ScanRecordPtr scanptr; ScanRecordPtr scanptr;
UintR cscanNoFreeRec; UintR cscanNoFreeRec;
......
...@@ -30,11 +30,11 @@ void Dblqh::initData() ...@@ -30,11 +30,11 @@ void Dblqh::initData()
cgcprecFileSize = ZGCPREC_FILE_SIZE; cgcprecFileSize = ZGCPREC_FILE_SIZE;
chostFileSize = MAX_NDB_NODES; chostFileSize = MAX_NDB_NODES;
clcpFileSize = ZNO_CONCURRENT_LCP; clcpFileSize = ZNO_CONCURRENT_LCP;
clfoFileSize = ZLFO_FILE_SIZE; clfoFileSize = 0;
clogFileFileSize = 0; clogFileFileSize = 0;
clogPartFileSize = ZLOG_PART_FILE_SIZE; clogPartFileSize = ZLOG_PART_FILE_SIZE;
cpageRefFileSize = ZPAGE_REF_FILE_SIZE; cpageRefFileSize = ZPAGE_REF_FILE_SIZE;
cscanrecFileSize = ZSCANREC_FILE_SIZE; cscanrecFileSize = 0;
ctabrecFileSize = 0; ctabrecFileSize = 0;
ctcConnectrecFileSize = 0; ctcConnectrecFileSize = 0;
ctcNodeFailrecFileSize = MAX_NDB_NODES; ctcNodeFailrecFileSize = MAX_NDB_NODES;
......
...@@ -1023,6 +1023,11 @@ void Dblqh::execREAD_CONFIG_REQ(Signal* signal) ...@@ -1023,6 +1023,11 @@ void Dblqh::execREAD_CONFIG_REQ(Signal* signal)
clogPageFileSize+= (16 - mega_byte_part); clogPageFileSize+= (16 - mega_byte_part);
} }
/* maximum number of log file operations */
clfoFileSize = clogPageFileSize;
if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
clfoFileSize = ZLFO_MIN_FILE_SIZE;
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_TABLE, &ctabrecFileSize)); ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_TABLE, &ctabrecFileSize));
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_TC_CONNECT, ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_TC_CONNECT,
&ctcConnectrecFileSize)); &ctcConnectrecFileSize));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment