summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jonas@perch.ndb.mysql.com>2006-10-10 15:27:47 +0200
committerunknown <jonas@perch.ndb.mysql.com>2006-10-10 15:27:47 +0200
commitef0ee7642ad986551495bd891ad78bcdb11c7fcf (patch)
treea96f52df04f385b70dd4c15309424e3728dc6afc
parente833ecae4b00282a9bc5927baa4088af4b65804c (diff)
parentff604cb77c3bcfe78eec3fd05ee7a1bd74fd5149 (diff)
downloadmariadb-git-ef0ee7642ad986551495bd891ad78bcdb11c7fcf.tar.gz
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
-rw-r--r--storage/ndb/tools/restore/restore_main.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/ndb/tools/restore/restore_main.cpp b/storage/ndb/tools/restore/restore_main.cpp
index dddabc8e9ef..c6947f3bf01 100644
--- a/storage/ndb/tools/restore/restore_main.cpp
+++ b/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