1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/M50/mysql-5.0
This commit is contained in:
unknown 2005-08-25 15:19:51 +02:00
commit 077c842032
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View File

@ -390,6 +390,9 @@ void Dbdict::execFSCLOSECONF(Signal* signal)
jam(); jam();
closeWriteTableConf(signal, fsPtr); closeWriteTableConf(signal, fsPtr);
break; break;
case FsConnectRecord::FsConnectRecord::OPEN_READ_SCHEMA2:
openSchemaFile(signal, 1, fsPtr.i, false, false);
break;
default: default:
jamLine((fsPtr.p->fsState & 0xFFF)); jamLine((fsPtr.p->fsState & 0xFFF));
ndbrequire(false); ndbrequire(false);
@ -1090,10 +1093,13 @@ void Dbdict::readSchemaConf(Signal* signal,
void Dbdict::readSchemaRef(Signal* signal, void Dbdict::readSchemaRef(Signal* signal,
FsConnectRecordPtr fsPtr) FsConnectRecordPtr fsPtr)
{ {
/**
* First close corrupt file
*/
fsPtr.p->fsState = FsConnectRecord::OPEN_READ_SCHEMA2; fsPtr.p->fsState = FsConnectRecord::OPEN_READ_SCHEMA2;
openSchemaFile(signal, 1, fsPtr.i, false, false); closeFile(signal, fsPtr.p->filePtr, fsPtr.i);
return; return;
}//Dbdict::readSchemaRef() }
void Dbdict::closeReadSchemaConf(Signal* signal, void Dbdict::closeReadSchemaConf(Signal* signal,
FsConnectRecordPtr fsPtr) FsConnectRecordPtr fsPtr)