Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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
1.2112 06/02/16 09:07:17 jonas@stripped +4 -0
Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
1.95 06/02/16 09:07:13 jonas@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
1.54 06/02/16 09:07:13 jonas@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
1.16 06/02/16 09:07:13 jonas@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
1.80 06/02/16 09:07:12 jonas@stripped +0 -0
Auto merged
# 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: jonas
# Host: perch.ndb.mysql.com
# Root: /home/jonas/src/mysql-5.1-new/RESYNC
--- 1.79/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2006-02-16 09:05:54 +01:00
+++ 1.80/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2006-02-16 09:07:12 +01:00
@@ -1476,8 +1476,8 @@
/* ---------------------------------------------------------------- */
/* **************************************************************** */
-Dbdict::Dbdict(const class Configuration & conf):
- SimulatedBlock(DBDICT, conf),
+Dbdict::Dbdict(Block_context& ctx):
+ SimulatedBlock(DBDICT, ctx),
c_attributeRecordHash(c_attributeRecordPool),
c_file_hash(c_file_pool),
c_filegroup_hash(c_filegroup_pool),
@@ -1504,10 +1504,6 @@
{
BLOCK_CONSTRUCTOR(Dbdict);
- const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();
- ndbrequire(p != 0);
-
- ndb_mgm_get_int_parameter(p, CFG_DB_NO_TRIGGERS, &c_maxNoOfTriggers);
// Transit signals
addRecSignal(GSN_DUMP_STATE_ORD, &Dbdict::execDUMP_STATE_ORD);
addRecSignal(GSN_GET_TABINFOREQ, &Dbdict::execGET_TABINFOREQ);
@@ -2019,10 +2015,12 @@
jamEntry();
const ndb_mgm_configuration_iterator * p =
- theConfiguration.getOwnConfigIterator();
+ m_ctx.m_config.getOwnConfigIterator();
ndbrequire(p != 0);
Uint32 attributesize, tablerecSize;
+ ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_NO_TRIGGERS,
+ &c_maxNoOfTriggers));
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DICT_ATTRIBUTE,&attributesize));
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DICT_TABLE, &tablerecSize));
--- 1.15/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp 2006-02-16 09:05:54 +01:00
+++ 1.16/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp 2006-02-16 09:07:13 +01:00
@@ -21,7 +21,6 @@
#include <pc.hpp>
#include <SimulatedBlock.hpp>
#include "Sysfile.hpp"
-#include <ArrayList.hpp>
#include <SignalCounter.hpp>
#include <signaldata/MasterLCP.hpp>
@@ -570,7 +569,7 @@
typedef Ptr<TakeOverRecord> TakeOverRecordPtr;
public:
- Dbdih(const class Configuration &);
+ Dbdih(Block_context& ctx);
virtual ~Dbdih();
struct RWFragment {
@@ -1554,13 +1553,13 @@
* Pool/list of WaitGCPProxyRecord record
*/
ArrayPool<WaitGCPProxyRecord> waitGCPProxyPool;
- ArrayList<WaitGCPProxyRecord> c_waitGCPProxyList;
+ DLList<WaitGCPProxyRecord> c_waitGCPProxyList;
/**
* Pool/list of WaitGCPMasterRecord record
*/
ArrayPool<WaitGCPMasterRecord> waitGCPMasterPool;
- ArrayList<WaitGCPMasterRecord> c_waitGCPMasterList;
+ DLList<WaitGCPMasterRecord> c_waitGCPMasterList;
void checkWaitGCPProxy(Signal*, NodeId failedNodeId);
void checkWaitGCPMaster(Signal*, NodeId failedNodeId);
--- 1.53/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp 2006-02-16 09:05:54 +01:00
+++ 1.54/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp 2006-02-16 09:07:13 +01:00
@@ -1063,7 +1063,7 @@
jamEntry();
const ndb_mgm_configuration_iterator * p =
- theConfiguration.getOwnConfigIterator();
+ m_ctx.m_config.getOwnConfigIterator();
ndbrequireErr(p != 0, NDBD_EXIT_INVALID_CONFIG);
initData();
@@ -1149,7 +1149,7 @@
{
jamEntry();
cntrlblockref = signal->theData[0];
- if(theConfiguration.getInitialStart()){
+ if(m_ctx.m_config.getInitialStart()){
sendSignal(cntrlblockref, GSN_DIH_RESTARTREF, signal, 1, JBB);
} else {
readGciFileLab(signal);
@@ -11461,7 +11461,7 @@
memset(&sysfileData[0], 0, sizeof(sysfileData));
const ndb_mgm_configuration_iterator * p =
- theConfiguration.getOwnConfigIterator();
+ m_ctx.m_config.getOwnConfigIterator();
ndbrequire(p != 0);
c_lcpState.clcpDelay = 20;
--- 1.94/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2006-02-16 09:05:54 +01:00
+++ 1.95/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2006-02-16 09:07:13 +01:00
@@ -882,7 +882,7 @@
jamEntry();
const ndb_mgm_configuration_iterator * p =
- theConfiguration.getOwnConfigIterator();
+ m_ctx.m_config.getOwnConfigIterator();
ndbrequire(p != 0);
cnoLogFiles = 8;
@@ -890,6 +890,20 @@
&cnoLogFiles));
ndbrequire(cnoLogFiles > 0);
+ Uint32 log_page_size= 0;
+ ndb_mgm_get_int_parameter(p, CFG_DB_REDO_BUFFER,
+ &log_page_size);
+
+ /**
+ * Always set page size in half MBytes
+ */
+ clogPageFileSize= (log_page_size / sizeof(LogPageRecord));
+ Uint32 mega_byte_part= clogPageFileSize & 15;
+ if (mega_byte_part != 0) {
+ jam();
+ clogPageFileSize+= (16 - mega_byte_part);
+ }
+
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_TABLE, &ctabrecFileSize));
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_TC_CONNECT,
&ctcConnectrecFileSize));
@@ -11203,12 +11217,6 @@
sendSignal(BACKUP_REF, GSN_LCP_PREPARE_REQ, signal,
LcpPrepareReq::SignalLength, JBB);
- if (lcpPtr.p->firstFragmentFlag)
- {
- lcpPtr.p->m_outstanding++;
- sendSignal(PGMAN_REF, GSN_LCP_PREPARE_REQ, signal,
- LcpPrepareReq::SignalLength, JBB);
- }
}//Dblqh::sendLCP_FRAGIDREQ()
void Dblqh::sendEMPTY_LCP_CONF(Signal* signal, bool idle)
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.2112) | jonas | 16 Feb |
