Commit dc8649ba authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/41-work

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
parents 20e21807 931af319
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -2464,7 +2464,8 @@ void Dbdict::checkSchemaStatus(Signal* signal)
	tablePtr.p->tableType = (DictTabInfo::TableType)oldEntry->m_tableType;
	
	// On NR get index from master because index state is not on file
	const bool file = c_systemRestart || tablePtr.p->isTable();
	const bool file = (* newEntry == * oldEntry) &&
	  (c_systemRestart || tablePtr.p->isTable());
	restartCreateTab(signal, tableId, oldEntry, file);

	return;