From 5d4a23138cad024bc8eec06dadacd8208905a614 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 22 Nov 2015 01:15:14 +0000 Subject: [PATCH] mdbx: backport - ITS#8320 mdb_load: fix loading data from simple text files. mdb_load -T was supposed to read escaped text, but 21b51cb7 "Add mdb_load" made it read hex. Change-Id: If12a01ee897af0570d95744626815c535cc81f9f --- CHANGES | 1 + mdb_load.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index df82a13c..03db4c3f 100644 --- a/CHANGES +++ b/CHANGES @@ -22,6 +22,7 @@ LMDB 0.9.17 Release Engineering Fix ITS#8315 dirty_room in nested txn Fix ITS#8316 page_merge cursor tracking Fix ITS#8319 mdb_load error messages + Fix ITS#8320 mdb_load plaintext input Fix ITS#8321 cursor tracking Added mdb_txn_id() (ITS#7994) Added robust mutex support diff --git a/mdb_load.c b/mdb_load.c index c81a0fa8..8ec257f9 100644 --- a/mdb_load.c +++ b/mdb_load.c @@ -332,7 +332,7 @@ int main(int argc, char *argv[]) putflags = MDB_NOOVERWRITE|MDB_NODUPDATA; break; case 'T': - mode |= NOHDR; + mode |= NOHDR | PRINT; break; default: usage();