upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "ITS#7789 update RESIZED errmsg text"

Browse source 
This reverts commit d8e18551c3.
And partially reverts mapsize check. Only mapsize increases are relevant.
This commit is contained in:
Howard Chu 2014-07-09 06:17:54 -07:00
parent d5371347e8
commit a5e4eecb1e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/liblmdb/mdb.c
View file

@ -1248,7 +1248,7 @@ static char *const mdb_errstr[] = {
"MDB_TXN_FULL: Transaction has too many dirty pages - transaction too big", "MDB_TXN_FULL: Transaction has too many dirty pages - transaction too big",
"MDB_CURSOR_FULL: Internal error - cursor stack limit reached", "MDB_CURSOR_FULL: Internal error - cursor stack limit reached",
"MDB_PAGE_FULL: Internal error - page has no more space", "MDB_PAGE_FULL: Internal error - page has no more space",
"MDB_MAP_RESIZED: Environment mapsize was changed by another process", "MDB_MAP_RESIZED: Database contents grew beyond environment mapsize",
"MDB_INCOMPATIBLE: Operation and DB incompatible, or DB flags changed", "MDB_INCOMPATIBLE: Operation and DB incompatible, or DB flags changed",
"MDB_BAD_RSLOT: Invalid reuse of reader locktable slot", "MDB_BAD_RSLOT: Invalid reuse of reader locktable slot",
"MDB_BAD_TXN: Transaction cannot recover - it must be aborted", "MDB_BAD_TXN: Transaction cannot recover - it must be aborted",
@ -2503,9 +2503,9 @@ mdb_txn_renew0(MDB_txn *txn)
} }
txn->mt_dbflags[0] = txn->mt_dbflags[1] = DB_VALID; txn->mt_dbflags[0] = txn->mt_dbflags[1] = DB_VALID;
/* If we didn't ask for a resize, but the size changed, fail */ /* If we didn't ask for a resize, but the size grew, fail */
if (!(env->me_flags & MDB_RESIZING) if (!(env->me_flags & MDB_RESIZING)
&& env->me_mapsize != meta->mm_mapsize) { && env->me_mapsize < meta->mm_mapsize) {
mdb_txn_reset0(txn, "renew0-mapfail"); mdb_txn_reset0(txn, "renew0-mapfail");
if (new_notls) { if (new_notls) {
txn->mt_u.reader->mr_pid = 0; txn->mt_u.reader->mr_pid = 0;