Commit f5eb28f1 authored by joreland@mysql.com's avatar joreland@mysql.com

More testBackup fixes

parent 38e210dc
...@@ -205,6 +205,11 @@ int runClearTable(NDBT_Context* ctx, NDBT_Step* step){ ...@@ -205,6 +205,11 @@ int runClearTable(NDBT_Context* ctx, NDBT_Step* step){
return NDBT_OK; 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" #include "bank/Bank.hpp"
int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){ int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){
...@@ -408,7 +413,7 @@ TESTCASE("BackupOne", ...@@ -408,7 +413,7 @@ TESTCASE("BackupOne",
INITIALIZER(runRestoreOne); INITIALIZER(runRestoreOne);
VERIFIER(runVerifyOne); VERIFIER(runVerifyOne);
FINALIZER(runClearTable); FINALIZER(runClearTable);
FINALIZER(runDropTable);
} }
TESTCASE("BackupBank", TESTCASE("BackupBank",
"Test that backup and restore works during transaction load\n" "Test that backup and restore works during transaction load\n"
......
...@@ -149,13 +149,12 @@ NdbBackup::execRestore(bool _restore_data, ...@@ -149,13 +149,12 @@ NdbBackup::execRestore(bool _restore_data,
ndbout << "res: " << res << endl; 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 #if 1
"", "",
#else #else
"valgrind --leak-check=yes -v " "valgrind --leak-check=yes -v "
#endif #endif
ownNodeId,
addr.c_str(), addr.c_str(),
_node_id, _node_id,
_backup_id, _backup_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment