diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2007-04-24 08:24:34 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2007-04-24 08:24:34 +0200 |
| commit | 7cf39ee031ed752e3833fbe92fb4a834f1397783 (patch) | |
| tree | 1356f9d2f21d18aaf1b6867682d397db2a8310a1 /storage/ndb | |
| parent | e79f14e152117e0090f6a208f8e69b971c43d51d (diff) | |
| parent | 55e96b9eab7fb1eea0f6f5aebeade98eb84eff9f (diff) | |
| download | mariadb-git-7cf39ee031ed752e3833fbe92fb4a834f1397783.tar.gz | |
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
Diffstat (limited to 'storage/ndb')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp index 318dc1aea8e..39dda8b6db5 100644 --- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp +++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp @@ -2819,8 +2819,10 @@ void Dbdict::checkSchemaStatus(Signal* signal) continue; case SchemaFile::ADD_STARTED: jam(); case SchemaFile::DROP_TABLE_STARTED: jam(); - ndbrequire(false); - return; + ndbrequire(DictTabInfo::isTable(newEntry->m_tableType) || + DictTabInfo::isIndex(newEntry->m_tableType)); + newEntry->m_tableState = SchemaFile::INIT; + continue; case SchemaFile::TABLE_ADD_COMMITTED: jam(); case SchemaFile::ALTER_TABLE_COMMITTED: jam(); if (DictTabInfo::isIndex(newEntry->m_tableType) || |