From b95e2525b835b2452c6a4e212bee3e8e885bdb47 Mon Sep 17 00:00:00 2001 From: unknown <joreland@mysql.com> Date: Tue, 17 Aug 2004 08:50:01 +0200 Subject: [PATCH] More testBackup fixes ndb/test/ndbapi/testBackup.cpp: Drop table after testBackup ndb/test/src/NdbBackup.cpp: Remove node id --- ndb/test/ndbapi/testBackup.cpp | 7 ++++++- ndb/test/src/NdbBackup.cpp | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ndb/test/ndbapi/testBackup.cpp b/ndb/test/ndbapi/testBackup.cpp index 07355de262..d328a7db29 100644 --- a/ndb/test/ndbapi/testBackup.cpp +++ b/ndb/test/ndbapi/testBackup.cpp @@ -205,6 +205,11 @@ int runClearTable(NDBT_Context* ctx, NDBT_Step* step){ return NDBT_OK; } +int runDropTable(NDBT_Context* ctx, NDBT_Step* step){ + GETNDB(step)->getDictionary()->dropTable(ctx->getTab()->getName()); + return NDBT_OK; +} + #include "bank/Bank.hpp" int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){ @@ -408,7 +413,7 @@ TESTCASE("BackupOne", INITIALIZER(runRestoreOne); VERIFIER(runVerifyOne); FINALIZER(runClearTable); - + FINALIZER(runDropTable); } TESTCASE("BackupBank", "Test that backup and restore works during transaction load\n" diff --git a/ndb/test/src/NdbBackup.cpp b/ndb/test/src/NdbBackup.cpp index 0d6464ebfb..a40c6ba7d7 100644 --- a/ndb/test/src/NdbBackup.cpp +++ b/ndb/test/src/NdbBackup.cpp @@ -149,13 +149,12 @@ NdbBackup::execRestore(bool _restore_data, ndbout << "res: " << res << endl; - snprintf(buf, 255, "%sndb_restore -c \"nodeid=%d;host=%s\" -n %d -b %d %s %s .", + snprintf(buf, 255, "%sndb_restore -c \"host=%s\" -n %d -b %d %s %s .", #if 1 "", #else "valgrind --leak-check=yes -v " #endif - ownNodeId, addr.c_str(), _node_id, _backup_id, -- 2.30.9