Commit 720f56fb authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files

Bug #28770 file already opened error when corrupt schema file 

- make sure we close the first file, before opening the next
parent 643cc087

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

+7 −1
Original line number Diff line number Diff line
@@ -401,6 +401,9 @@ void Dbdict::execFSCLOSECONF(Signal* signal) 
  case FsConnectRecord::OPEN_READ_SCHEMA2:

    openSchemaFile(signal, 1, fsPtr.i, false, false);

    break;

  case FsConnectRecord::OPEN_READ_TAB_FILE2:

    openTableFile(signal, 1, fsPtr.i, c_readTableRecord.tableId, false);

    break;

  default:

    jamLine((fsPtr.p->fsState & 0xFFF));

    ndbrequire(false);
@@ -780,8 +783,11 @@ void Dbdict::readTableConf(Signal* signal, 
void Dbdict::readTableRef(Signal* signal,

                          FsConnectRecordPtr fsPtr)

{

  /**

   * First close corrupt file

   */

  fsPtr.p->fsState = FsConnectRecord::OPEN_READ_TAB_FILE2;

  openTableFile(signal, 1, fsPtr.i, c_readTableRecord.tableId, false);

  closeFile(signal, fsPtr.p->filePtr, fsPtr.i);

  return;

}//Dbdict::readTableRef()