From 3d8fc321d55ff995ce2ed37fdeab375e1b93fff6 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Fri, 9 Feb 2018 18:45:20 +0000 Subject: [PATCH 1/5] 0.9.22 engineering --- libraries/liblmdb/CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES index 1a316123ec..12e0279f19 100644 --- a/libraries/liblmdb/CHANGES +++ b/libraries/liblmdb/CHANGES @@ -1,5 +1,7 @@ LMDB 0.9 Change Log +LMDB 0.9.22 Engineering + LMDB 0.9.21 Release (2017/06/01) Fix xcursor after cursor_del (ITS#8622) From b2426af3d1676ac51c9e796f45982c88a28e65ea Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Wed, 7 Jun 2017 13:42:51 -0700 Subject: [PATCH 2/5] ITS#8612 Fix Solaris builds with liblmdb This patch fixes liblmdb builds on Solaris and derivatives by defining _POSIX_PTHREAD_SEMANTICS --- libraries/liblmdb/mdb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 90ac99f2d8..87ff230833 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -113,6 +113,10 @@ typedef SSIZE_T ssize_t; /* Most platforms have posix_memalign, older may only have memalign */ #define HAVE_MEMALIGN 1 #include +/* On Solaris, we need the POSIX sigwait function */ +#if defined (__sun) +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif #endif #if !(defined(BYTE_ORDER) || defined(__BYTE_ORDER)) From 4ac16b128cec6f01933b31a9dc1579a664be0121 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Fri, 9 Feb 2018 18:46:06 +0000 Subject: [PATCH 3/5] ITS#8612 --- libraries/liblmdb/CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES index 12e0279f19..2976c8685a 100644 --- a/libraries/liblmdb/CHANGES +++ b/libraries/liblmdb/CHANGES @@ -3,6 +3,7 @@ LMDB 0.9 Change Log LMDB 0.9.22 Engineering LMDB 0.9.21 Release (2017/06/01) + Fix liblmdb to build on Solaris (ITS#8612) Fix xcursor after cursor_del (ITS#8622) LMDB 0.9.20 (Withdrawn) From a4d9a75a1e3b907392f3e00586da4611bbfe09bb Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 26 Oct 2017 19:04:37 +0100 Subject: [PATCH 4/5] ITS#8760 fix regression in 0.9.19 --- libraries/liblmdb/mdb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index 87ff230833..e9d385c8ae 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -9758,8 +9758,11 @@ int mdb_dbi_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *db MDB_node *node = NODEPTR(mc.mc_pg[mc.mc_top], mc.mc_ki[mc.mc_top]); if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) != F_SUBDATA) return MDB_INCOMPATIBLE; - } else if (! (rc == MDB_NOTFOUND && (flags & MDB_CREATE))) { - return rc; + } else { + if (rc != MDB_NOTFOUND || !(flags & MDB_CREATE)) + return rc; + if (F_ISSET(txn->mt_flags, MDB_TXN_RDONLY)) + return EACCES; } /* Done here so we cannot fail after creating a new DB */ From e20e30792985c91a0f40bf30acc53775e7089b2e Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Fri, 9 Feb 2018 18:47:21 +0000 Subject: [PATCH 5/5] ITS#8760 --- libraries/liblmdb/CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES index 2976c8685a..dcc7508b7a 100644 --- a/libraries/liblmdb/CHANGES +++ b/libraries/liblmdb/CHANGES @@ -3,6 +3,7 @@ LMDB 0.9 Change Log LMDB 0.9.22 Engineering LMDB 0.9.21 Release (2017/06/01) + Fix regression with new db from 0.9.19 (ITS#8760) Fix liblmdb to build on Solaris (ITS#8612) Fix xcursor after cursor_del (ITS#8622)