Commit d971e4d4 authored by joreland@mysql.com's avatar joreland@mysql.com

Fix for diskless

parent 8c8efefd
...@@ -2863,8 +2863,9 @@ private: ...@@ -2863,8 +2863,9 @@ private:
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
UintR preComputedRequestInfoMask; UintR preComputedRequestInfoMask;
UintR ctransidHash[1024]; UintR ctransidHash[1024];
Uint32 c_diskless;
public: public:
/** /**
* *
......
...@@ -892,6 +892,8 @@ void Dblqh::execREAD_CONFIG_REQ(Signal* signal) ...@@ -892,6 +892,8 @@ void Dblqh::execREAD_CONFIG_REQ(Signal* signal)
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_SCAN, &cscanrecFileSize)); ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_SCAN, &cscanrecFileSize));
cmaxAccOps = cscanrecFileSize * MAX_PARALLEL_SCANS_PER_FRAG; cmaxAccOps = cscanrecFileSize * MAX_PARALLEL_SCANS_PER_FRAG;
ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_DB_DISCLESS, &c_diskless));
initRecords(); initRecords();
initialiseRecordsLab(signal, 0, ref, senderData); initialiseRecordsLab(signal, 0, ref, senderData);
...@@ -15088,6 +15090,11 @@ void Dblqh::openSrFourthPhaseLab(Signal* signal) ...@@ -15088,6 +15090,11 @@ void Dblqh::openSrFourthPhaseLab(Signal* signal)
void Dblqh::readSrFourthPhaseLab(Signal* signal) void Dblqh::readSrFourthPhaseLab(Signal* signal)
{ {
if(c_diskless){
jam();
logPagePtr.p->logPageWord[ZPOS_LOG_LAP] = 1;
}
/* ------------------------------------------------------------------------ /* ------------------------------------------------------------------------
* INITIALISE ALL LOG PART INFO AND LOG FILE INFO THAT IS NEEDED TO * INITIALISE ALL LOG PART INFO AND LOG FILE INFO THAT IS NEEDED TO
* START UP THE SYSTEM. * START UP THE SYSTEM.
...@@ -15116,6 +15123,7 @@ void Dblqh::readSrFourthPhaseLab(Signal* signal) ...@@ -15116,6 +15123,7 @@ void Dblqh::readSrFourthPhaseLab(Signal* signal)
logPartPtr.p->logLap = logPagePtr.p->logPageWord[ZPOS_LOG_LAP]; logPartPtr.p->logLap = logPagePtr.p->logPageWord[ZPOS_LOG_LAP];
logFilePtr.p->currentFilepage = logPartPtr.p->headPageNo; logFilePtr.p->currentFilepage = logPartPtr.p->headPageNo;
logFilePtr.p->currentLogpage = logPagePtr.i; logFilePtr.p->currentLogpage = logPagePtr.i;
initLogpage(signal); initLogpage(signal);
logPagePtr.p->logPageWord[ZCURR_PAGE_INDEX] = logPartPtr.p->headPageIndex; logPagePtr.p->logPageWord[ZCURR_PAGE_INDEX] = logPartPtr.p->headPageIndex;
logFilePtr.p->remainingWordsInMbyte = logFilePtr.p->remainingWordsInMbyte =
......
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