Merge eel.(none):/home/jonas/src/mysql-4.1 (7fafb009) · Commits · Software / OSDI20 Artifacts / mariadb

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -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)