From 62e4eeb7f7baa2c0ecd03f95aff4cc5037e94557 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 19 Sep 2014 01:45:43 +0100 Subject: [PATCH 1/3] ITS#7943 reinit txn flags When reusing the main write txn --- libraries/liblmdb/mdb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 7ddb36e..6cc3433 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -2626,6 +2626,7 @@ mdb_txn_begin(MDB_env *env, MDB_txn *parent, unsigned int flags, MDB_txn **ret) if (!(flags & MDB_RDONLY)) { if (!parent) { txn = env->me_txn0; + txn->mt_flags = 0; goto ok; } size += env->me_maxdbs * sizeof(MDB_cursor *); From 2f587ae081d076e3707360c5db086520c219d3ea Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 20 Sep 2014 07:24:32 +0100 Subject: [PATCH 2/3] new date --- libraries/liblmdb/CHANGES | 2 +- libraries/liblmdb/lmdb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES index c988622..34049ba 100644 --- a/libraries/liblmdb/CHANGES +++ b/libraries/liblmdb/CHANGES @@ -1,6 +1,6 @@ LMDB 0.9 Change Log -LMDB 0.9.14 Release (2014/09/15) +LMDB 0.9.14 Release (2014/09/20) Fix to support 64K page size (ITS#7713) Fix to persist decreased as well as increased mapsizes (ITS#7789) Fix cursor bug when deleting last node of a DUPSORT key diff --git a/libraries/liblmdb/lmdb.h b/libraries/liblmdb/lmdb.h index 5c7e9fc..bdbb0b9 100644 --- a/libraries/liblmdb/lmdb.h +++ b/libraries/liblmdb/lmdb.h @@ -194,7 +194,7 @@ typedef int mdb_filehandle_t; MDB_VERINT(MDB_VERSION_MAJOR,MDB_VERSION_MINOR,MDB_VERSION_PATCH) /** The release date of this library version */ -#define MDB_VERSION_DATE "September 15, 2014" +#define MDB_VERSION_DATE "September 20, 2014" /** A stringifier for the version info */ #define MDB_VERSTR(a,b,c,d) "LMDB " #a "." #b "." #c ": (" d ")" From a7639a66a493818dc55f3ed77bebe659b6cdd2fd Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 25 Sep 2014 19:25:56 +0100 Subject: [PATCH 3/3] Android also only has memalign --- libraries/liblmdb/mdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 6cc3433..60dfd8d 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -90,7 +90,7 @@ extern int cacheflush(char *addr, int nbytes, int cache); #include #include -#if defined(__sun) +#if defined(__sun) || defined(ANDROID) /* Most platforms have posix_memalign, older may only have memalign */ #define HAVE_MEMALIGN 1 #include