Commit 381dedcb authored by unknown's avatar unknown
Browse files

Merge eel.(none):/home/jonas/src/mysql-4.1 

into  eel.(none):/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge
parents 00455bd9 58e57625

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

+8 −2
Original line number Diff line number Diff line
@@ -390,6 +390,9 @@ void Dbdict::execFSCLOSECONF(Signal* signal) 
    jam();

    closeWriteTableConf(signal, fsPtr);

    break;

  case FsConnectRecord::FsConnectRecord::OPEN_READ_SCHEMA2:

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

    break;

  default:

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

    ndbrequire(false);
@@ -1090,10 +1093,13 @@ void Dbdict::readSchemaConf(Signal* signal, 
void Dbdict::readSchemaRef(Signal* signal,

                           FsConnectRecordPtr fsPtr)

{

  /**

   * First close corrupt file

   */

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

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

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

  return;

}//Dbdict::readSchemaRef()

}



void Dbdict::closeReadSchemaConf(Signal* signal,

                                 FsConnectRecordPtr fsPtr)