Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca (a325e1db) · Commits · Software / OSDI20 Artifacts / mariadb

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -404,6 +404,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);
		@@ -783,8 +786,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()