upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-03 20:40:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Quanah Gibson-Mount 2014-07-21 11:00:14 -05:00
commit 35f4443679
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/liblmdb/CHANGES
View file

@ -8,7 +8,7 @@ LMDB 0.9.14 Engineering
Fix ambiguous error code from writing to closed DBI (ITS#7825)
Fix mdb_copy copying past end of file (ITS#7886)
Fix cursor bugs from page_merge/rebalance
Fix to dirty fewer pages in deletes (mdb_page_loose()
Fix to dirty fewer pages in deletes (mdb_page_loose())
Fix Windows compat issues in mtests (ITS#7879)
Add compacting variant of mdb_copy
Add BigEndian integer key compare code

5
libraries/liblmdb/mdb.c
View file

@ -3841,7 +3841,7 @@ mdb_env_open2(MDB_env *env)
env->me_flags |= MDB_RESIZING;
}
rc = mdb_env_map(env, meta.mm_address);
rc = mdb_env_map(env, (flags & MDB_FIXEDMAP) ? meta.mm_address : NULL);
if (rc)
return rc;
@ -6989,6 +6989,9 @@ mdb_cursor_count(MDB_cursor *mc, size_t *countp)
if (mc->mc_txn->mt_flags & MDB_TXN_ERROR)
return MDB_BAD_TXN;
if (!(mc->mc_flags & C_INITIALIZED))
return EINVAL;
leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]);
if (!F_ISSET(leaf->mn_flags, F_DUPDATA)) {
*countp = 1;

12
libraries/liblmdb/mdb_load.c
View file

@ -66,7 +66,7 @@ flagbit dbflags[] = {
static const char hexc[] = "0123456789abcdef";
static void readhdr()
static void readhdr(void)
{
char *ptr;
@ -155,7 +155,7 @@ static void readhdr()
}
}
static void badend()
static void badend(void)
{
fprintf(stderr, "%s: line %" Z "d: unexpected end of input\n",
prog, lineno);
@ -274,7 +274,7 @@ badend:
return 0;
}
static void usage()
static void usage(void)
{
fprintf(stderr, "usage: %s dbpath [-V] [-f input] [-n] [-s name] [-N] [-T]\n", prog);
exit(EXIT_FAILURE);
@ -294,7 +294,7 @@ int main(int argc, char *argv[])
prog = argv[0];
if (argc < 2) {
usage(prog);
usage();
}
/* -f: load file instead of stdin
@ -330,12 +330,12 @@ int main(int argc, char *argv[])
mode |= NOHDR;
break;
default:
usage(prog);
usage();
}
}
if (optind != argc - 1)
usage(prog);
usage();
dbuf.mv_size = 4096;
dbuf.mv_data = malloc(dbuf.mv_size);