mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
bug#12027 - ndb
When detecting corrupt schema file. Make sure to close it (as it will be opened later when rewriting a clean copy)
This commit is contained in:
parent
3aede000a2
commit
7fe87018b4
1 changed files with 8 additions and 2 deletions
|
@ -369,6 +369,9 @@ void Dbdict::execFSCLOSECONF(Signal* signal)
|
|||
jam();
|
||||
closeWriteTableConf(signal, fsPtr);
|
||||
break;
|
||||
case FsConnectRecord::FsConnectRecord::OPEN_READ_SCHEMA2:
|
||||
openSchemaFile(signal, 1, fsPtr.i, false);
|
||||
break;
|
||||
default:
|
||||
jamLine((fsPtr.p->fsState & 0xFFF));
|
||||
ndbrequire(false);
|
||||
|
@ -1012,10 +1015,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);
|
||||
closeFile(signal, fsPtr.p->filePtr, fsPtr.i);
|
||||
return;
|
||||
}//Dbdict::readSchemaRef()
|
||||
}
|
||||
|
||||
void Dbdict::closeReadSchemaConf(Signal* signal,
|
||||
FsConnectRecordPtr fsPtr)
|
||||
|
|
Loading…
Add table
Reference in a new issue