|
|
@ -4670,6 +4670,7 @@ mdb_env_open(MDB_env *env, const char *path, unsigned int flags, mdb_mode_t mode |
|
|
|
rc = ENOMEM; |
|
|
|
rc = ENOMEM; |
|
|
|
goto leave; |
|
|
|
goto leave; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
env->me_dbxs[FREE_DBI].md_cmp = mdb_cmp_long; /* aligned MDB_INTEGERKEY */ |
|
|
|
|
|
|
|
|
|
|
|
/* For RDONLY, get lockfile after we know datafile exists */ |
|
|
|
/* For RDONLY, get lockfile after we know datafile exists */ |
|
|
|
if (!(flags & (MDB_RDONLY|MDB_NOLOCK))) { |
|
|
|
if (!(flags & (MDB_RDONLY|MDB_NOLOCK))) { |
|
|
@ -9291,10 +9292,6 @@ int mdb_dbi_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *db |
|
|
|
unsigned int unused = 0, seq; |
|
|
|
unsigned int unused = 0, seq; |
|
|
|
size_t len; |
|
|
|
size_t len; |
|
|
|
|
|
|
|
|
|
|
|
if (txn->mt_dbxs[FREE_DBI].md_cmp == NULL) { |
|
|
|
|
|
|
|
mdb_default_cmp(txn, FREE_DBI); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ((flags & VALID_FLAGS) != flags) |
|
|
|
if ((flags & VALID_FLAGS) != flags) |
|
|
|
return EINVAL; |
|
|
|
return EINVAL; |
|
|
|
if (txn->mt_flags & MDB_TXN_ERROR) |
|
|
|
if (txn->mt_flags & MDB_TXN_ERROR) |
|
|
|