mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
More testBackup fixes
ndb/test/ndbapi/testBackup.cpp: Drop table after testBackup ndb/test/src/NdbBackup.cpp: Remove node id
This commit is contained in:
parent
cee499f1b5
commit
b95e2525b8
2 changed files with 7 additions and 3 deletions
|
|
@ -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",
|
||||||
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,
|
||||||
|
|
||||||
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,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue