Fix per-txn MDB_NOMETASYNC, MDB_NOSYNC.

Fallout from 4d02c741b120786df1b87ee9ed49c1d3f9bc7522. The flags
were ignored: mdb_txn_renew0/begin cleared and/or did not set them.

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 0e2e227b0aad4a00e10c9b3ceaf85488ce9a6ae6..4a5b7f086ad37ca3a347409fd472008f2c0af43e 100644 (file)
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -2735,9 +2735,9 @@ mdb_txn_begin(MDB_env *env, MDB_txn *parent, unsigned int flags, MDB_txn **ret)
                return EACCES;
        if (parent) {
                /* Nested transactions: Max 1 child, write txns only, no writemap */
+               flags |= parent->mt_flags;
                if (parent->mt_child ||
-                       ((flags | parent->mt_flags) &
-                        (MDB_RDONLY|MDB_WRITEMAP|MDB_TXN_ERROR)))
+                       (flags & (MDB_RDONLY|MDB_WRITEMAP|MDB_TXN_ERROR)))
                {
                        return (parent->mt_flags & MDB_TXN_RDONLY) ? EINVAL : MDB_BAD_TXN;
                }
@@ -2794,7 +2794,6 @@ ok:
                parent->mt_child = txn;
                txn->mt_parent = parent;
                txn->mt_numdbs = parent->mt_numdbs;
-               txn->mt_flags = parent->mt_flags;
                txn->mt_dbxs = parent->mt_dbxs;
                memcpy(txn->mt_dbs, parent->mt_dbs, txn->mt_numdbs * sizeof(MDB_db));
                /* Copy parent's mt_dbflags, but clear DB_NEW */
@@ -2822,6 +2821,7 @@ ok:
                if (txn != env->me_txn0)
                        free(txn);
        } else {
+               txn->mt_flags |= flags; /* for txn==me_txn0, no effect otherwise */
                *ret = txn;
                DPRINTF(("begin txn %"Z"u%c %p on mdbenv %p, root page %"Z"u",
                        txn->mt_txnid, (flags & MDB_RDONLY) ? 'r' : 'w',