Merge remote-tracking branch 'origin/mdb.master'

This commit is contained in:
Howard Chu 2014-09-19 02:30:32 +01:00
commit fd1bf39770

View File

@ -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 *);