Commit b44a608d authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/50-work 

into  perch.ndb.mysql.com:/home/jonas/src/51-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
parents f31b9f69 72a0f506

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

+1 −1
Original line number Diff line number Diff line
@@ -3001,7 +3001,7 @@ Dbdict::restartCreateTab_readTableConf(Signal* signal, 
			 c_readTableRecord.tableId,

			 parseRecord.errorCode);

    progError(__LINE__, 

	      ERR_INVALID_CONFIG,

	      NDBD_EXIT_INVALID_CONFIG,

	      buf);

    ndbrequire(parseRecord.errorCode == 0);

  }

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

+1 −1
Original line number Diff line number Diff line
@@ -16048,7 +16048,7 @@ void Dblqh::findLogfile(Signal* signal, 
		       "Unable to restart, failed while reading redo."

		       " Likely invalid change of configuration");

  progError(__LINE__, 

	    ERR_INVALID_CONFIG,

	    NDBD_EXIT_INVALID_CONFIG,

	    buf);

}//Dblqh::findLogfile()