add error code to ndb require

17944ace · tomas@whalegate.ndb.mysql.com · 30834432 · 17944ace
Commit 17944ace authored May 15, 2007 by tomas@whalegate.ndb.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

ndb/src/kernel/blocks/dbdict/Dbdict.cpp ndb/src/kernel/blocks/dbdict/Dbdict.cpp +2 -1

No files found.
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -1098,8 +1098,9 @@ void Dbdict::readSchemaConf(Signal* signal,
               n, reason, sf->FileSize, sf0->FileSize, sf->PageNumber);
      if (crashInd)
        progError(__LINE__, NDBD_EXIT_SR_SCHEMAFILE, reason_msg);
+      ndbrequireErr(fsPtr.p->fsState == FsConnectRecord::READ_SCHEMA1,
+                    NDBD_EXIT_SR_SCHEMAFILE);
      jam();
-      ndbrequire(fsPtr.p->fsState == FsConnectRecord::READ_SCHEMA1);
      infoEvent("primary %s, trying backup", reason_msg);
      readSchemaRef(signal, fsPtr);
      return;