Merge perch.ndb.mysql.com:/home/jonas/src/51-work

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

storage/ndb/tools/restore/restore_main.cpp

@@ -690,10 +690,9 @@ main(int argc, char** argv)
       clearConsumers();
       ndbout_c("\nRestore successful, but encountered temporary error, "
                "please look at configuration.");
-      return NDBT_ProgramExit(NDBT_TEMPORARY);
     }               
   }
-
+  
   clearConsumers();
   return NDBT_ProgramExit(NDBT_OK);
 } // main