Skip to content

M
MariaDB
Commit 542c9e9b authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files
Options

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents cf8ef29c dfa20089
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file @ 542c9e9b
...@@ -2819,8 +2819,10 @@ void Dbdict::checkSchemaStatus(Signal* signal) ...@@ -2819,8 +2819,10 @@ void Dbdict::checkSchemaStatus(Signal* signal)
continue; continue;
case SchemaFile::ADD_STARTED: jam(); case SchemaFile::ADD_STARTED: jam();
case SchemaFile::DROP_TABLE_STARTED: jam(); case SchemaFile::DROP_TABLE_STARTED: jam();
ndbrequire(false); ndbrequire(DictTabInfo::isTable(newEntry->m_tableType) ||
return; DictTabInfo::isIndex(newEntry->m_tableType));
newEntry->m_tableState = SchemaFile::INIT;
continue;
case SchemaFile::TABLE_ADD_COMMITTED: jam(); case SchemaFile::TABLE_ADD_COMMITTED: jam();
case SchemaFile::ALTER_TABLE_COMMITTED: jam(); case SchemaFile::ALTER_TABLE_COMMITTED: jam();
if (DictTabInfo::isIndex(newEntry->m_tableType) || if (DictTabInfo::isIndex(newEntry->m_tableType) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7