From b5e57be56b4942a474e09419e094a0bf00a2345b Mon Sep 17 00:00:00 2001
From: "mskold@mysql.com" <>
Date: Thu, 31 Mar 2005 19:18:50 +0200
Subject: [PATCH] Fixed so no merge conflict with 5.0

---
 ndb/src/kernel/blocks/dbdict/Dbdict.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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();