Commit 78bd6d93 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

bug#13966 - ndb 

  better error message on invalid config change
parent 155081e4

ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2402,7 +2402,7 @@ Dbdict::restartCreateTab_readTableConf(Signal* signal, 
    char buf[255];

    BaseString::snprintf(buf, sizeof(buf), 

			 "Unable to restart, fail while creating table %d"

			 " error: %d. Most likely change of configution",

			 " error: %d. Most likely change of configuration",

			 c_readTableRecord.tableId,

			 parseRecord.errorCode);

    progError(__LINE__,

ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+14 −0
Original line number Diff line number Diff line
@@ -16096,8 +16096,22 @@ void Dblqh::findLogfile(Signal* signal, 
    }//if

    locLogFilePtr.i = locLogFilePtr.p->nextLogFile;

    loopCount++;

    if (loopCount >= flfLogPartPtr.p->noLogFiles &&

	getNodeState().startLevel != NodeState::SL_STARTED)

    {

      goto error;

    }

    ndbrequire(loopCount < flfLogPartPtr.p->noLogFiles);

  }//while









error:









  char buf[255];









  BaseString::snprintf(buf, sizeof(buf), 









		       "Unable to restart, failed while reading redo."









		       " Likely invalid change of configuration");









  progError(__LINE__, 









	    ERR_INVALID_CONFIG,









	    buf);









}//Dblqh::findLogfile()

















/* ------------------------------------------------------------------------- */