Commit a3ac499a 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/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
parents edeea349 bd720c4d

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

+14 −5
Original line number Diff line number Diff line
@@ -8252,11 +8252,20 @@ void Dbdih::openingTableErrorLab(Signal* signal, FileRecordPtr filePtr) 
  /*    WE FAILED IN OPENING A FILE. IF THE FIRST FILE THEN TRY WITH THE    */

  /*    DUPLICATE FILE, OTHERWISE WE REPORT AN ERROR IN THE SYSTEM RESTART. */

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

  ndbrequire(filePtr.i == tabPtr.p->tabFile[0]);

  if (filePtr.i == tabPtr.p->tabFile[0])

  {

    filePtr.i = tabPtr.p->tabFile[1];

    ptrCheckGuard(filePtr, cfileFileSize, fileRecord);

    openFileRw(signal, filePtr);

    filePtr.p->reqStatus = FileRecord::OPENING_TABLE;

  }

  else

  {

    char buf[256];

    BaseString::snprintf(buf, "Error opening DIH schema files for table: %d",

			 tabPtr.i);

    progError(__LINE__, NDBD_EXIT_AFS_NO_SUCH_FILE, buf);

  }

}//Dbdih::openingTableErrorLab()



void Dbdih::readingTableLab(Signal* signal, FileRecordPtr filePtr)

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

+1 −3
Original line number Diff line number Diff line
@@ -12579,19 +12579,17 @@ void Dblqh::lastWriteInFileLab(Signal* signal) 








void Dblqh::writePageZeroLab(Signal* signal) 









{









  if (false && logPartPtr.p->logPartState == LogPartRecord::FILE_CHANGE_PROBLEM) 









  if (logPartPtr.p->logPartState == LogPartRecord::FILE_CHANGE_PROBLEM) 









  {









    if (logPartPtr.p->firstLogQueue == RNIL) 









    {









      jam();









      logPartPtr.p->logPartState = LogPartRecord::IDLE;









      ndbout_c("resetting logPartState to IDLE");









    } 









    else 









    {









      jam();









      logPartPtr.p->logPartState = LogPartRecord::ACTIVE;









      ndbout_c("resetting logPartState to ACTIVE");









    }









  }