Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  manual merge

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

@@ -1400,9 +1400,9 @@ void Dbdict::readSchemaConf(Signal* signal,
                n, reason, sf->FileSize, sf0->FileSize, sf->PageNumber);
       if (crashInd)
         progError(__LINE__, NDBD_EXIT_SR_SCHEMAFILE, reason_msg);
-      jam();
       ndbrequireErr(fsPtr.p->fsState == FsConnectRecord::READ_SCHEMA1,
                     NDBD_EXIT_SR_SCHEMAFILE);
+      jam();
       infoEvent("primary %s, trying backup", reason_msg);
       readSchemaRef(signal, fsPtr);
       return;