diff options
author | unknown <mskold@mysql.com> | 2005-03-31 19:18:50 +0200 |
---|---|---|
committer | unknown <mskold@mysql.com> | 2005-03-31 19:18:50 +0200 |
commit | 181205f0327bcbdf047b78d5e1f1be3b6d36be0b (patch) | |
tree | 3d00f18c63634bdb1f53b2ae480ffb32fb79be7c /ndb | |
parent | 11b64a4ec964bf252b2e26261edd376a5f1d3a0c (diff) | |
download | mariadb-git-181205f0327bcbdf047b78d5e1f1be3b6d36be0b.tar.gz |
Fixed so no merge conflict with 5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Fixed so no merge conflict with
Diffstat (limited to 'ndb')
-rw-r--r-- | ndb/src/kernel/blocks/dbdict/Dbdict.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp index 0b8e1910850..7247b7e2b9c 100644 --- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp +++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp @@ -2227,8 +2227,9 @@ void Dbdict::checkSchemaStatus(Signal* signal) restartCreateTab(signal, tableId, oldEntry, false); return; }//if - break; } + ndbrequire(ok); + break; } case SchemaFile::DROP_TABLE_STARTED: jam(); |