diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mdbx_chk/src/mdbx_chk.cc | 12 | ||||
| -rw-r--r-- | tools/mdbx_dump/src/mdbx_dump.cc | 6 | ||||
| -rw-r--r-- | tools/mdbx_load/src/mdbx_load.cc | 9 |
3 files changed, 17 insertions, 10 deletions
diff --git a/tools/mdbx_chk/src/mdbx_chk.cc b/tools/mdbx_chk/src/mdbx_chk.cc index 5b41402f85..f2725bd37f 100644 --- a/tools/mdbx_chk/src/mdbx_chk.cc +++ b/tools/mdbx_chk/src/mdbx_chk.cc @@ -23,7 +23,7 @@ #endif /* _MSC_VER (warnings) */ #define MDBX_TOOLS /* Avoid using internal mdbx_assert() */ -#include "../../libs/libmdbx/src/src/elements/internals.h" +#include "../../libs/libmdbx/src/src/internals.h" typedef struct flagbit { int bit; @@ -39,8 +39,8 @@ const flagbit dbflags[] = {{MDBX_DUPSORT, "dupsort"}, {0, NULL}}; #if defined(_WIN32) || defined(_WIN64) -#include "../../libs/libmdbx/src/src/tools/wingetopt.h" -#include "../../libs/libmdbx/src/src/tools/wingetopt.c" +#include "../../libs/libmdbx/src/src/wingetopt.h" +#include "../../libs/libmdbx/src/src/wingetopt.c" static volatile BOOL user_break; static BOOL WINAPI ConsoleBreakHandlerRoutine(DWORD dwCtrlType) { @@ -562,6 +562,12 @@ static int process_db(MDBX_dbi dbi_handle, char *dbi_name, visitor *handler, uint64_t record_count = 0, dups = 0; uint64_t key_bytes = 0, data_bytes = 0; + if ((MDBX_TXN_FINISHED | MDBX_TXN_ERROR) & mdbx_txn_flags(txn)) { + print(" ! abort processing '%s' due to a previous error\n", + dbi_name ? dbi_name : "@MAIN"); + return MDBX_BAD_TXN; + } + if (dbi_handle == ~0u) { rc = mdbx_dbi_open(txn, dbi_name, 0, &dbi_handle); if (rc) { diff --git a/tools/mdbx_dump/src/mdbx_dump.cc b/tools/mdbx_dump/src/mdbx_dump.cc index f51903df4c..138650d8e7 100644 --- a/tools/mdbx_dump/src/mdbx_dump.cc +++ b/tools/mdbx_dump/src/mdbx_dump.cc @@ -23,7 +23,7 @@ #endif /* _MSC_VER (warnings) */ #define MDBX_TOOLS /* Avoid using internal mdbx_assert() */ -#include "../../libs/libmdbx/src/src/elements/internals.h" +#include "../../libs/libmdbx/src/src/internals.h" #include <ctype.h> @@ -44,8 +44,8 @@ flagbit dbflags[] = {{MDBX_REVERSEKEY, "reversekey"}, {0, NULL}}; #if defined(_WIN32) || defined(_WIN64) -#include "../../libs/libmdbx/src/src/tools/wingetopt.h" -#include "../../libs/libmdbx/src/src/tools/wingetopt.c" +#include "../../libs/libmdbx/src/src/wingetopt.h" +#include "../../libs/libmdbx/src/src/wingetopt.c" static volatile BOOL user_break; static BOOL WINAPI ConsoleBreakHandlerRoutine(DWORD dwCtrlType) { diff --git a/tools/mdbx_load/src/mdbx_load.cc b/tools/mdbx_load/src/mdbx_load.cc index 567ad5b93a..d9f7f872bd 100644 --- a/tools/mdbx_load/src/mdbx_load.cc +++ b/tools/mdbx_load/src/mdbx_load.cc @@ -23,13 +23,13 @@ #endif /* _MSC_VER (warnings) */ #define MDBX_TOOLS /* Avoid using internal mdbx_assert() */ -#include "../../libs/libmdbx/src/src/elements/internals.h" +#include "../../libs/libmdbx/src/src/internals.h" #include <ctype.h> #if defined(_WIN32) || defined(_WIN64) -#include "../../libs/libmdbx/src/src/tools/wingetopt.h" -#include "../../libs/libmdbx/src/src/tools/wingetopt.c" +#include "../../libs/libmdbx/src/src/wingetopt.h" +#include "../../libs/libmdbx/src/src/wingetopt.c" static volatile BOOL user_break; static BOOL WINAPI ConsoleBreakHandlerRoutine(DWORD dwCtrlType) { @@ -342,7 +342,8 @@ static void usage(void) { "dbpath\n" " -V\t\tprint version and exit\n" " -q\t\tbe quiet\n" - " -a\t\tappend records in input order\n" + " -a\t\tappend records in input order (required for custom " + "comparators)\n" " -f file\tread from file instead of stdin\n" " -s name\tload into named subDB\n" " -N\t\tuse NOOVERWRITE on puts\n" |