From: Howard Chu <hyc@openldap.org>
Date: Sun, 28 Aug 2011 11:19:58 +0000 (-0700)
Subject: Merge remote branch 'hbf/mdb.hbf' into mdb
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fcc88809ff1b161853a758631780b872a0cbb0c;p=thirdparty%2Fopenldap.git

Merge remote branch 'hbf/mdb.hbf' into mdb
---

0fcc88809ff1b161853a758631780b872a0cbb0c
diff --cc tests/data/slapd.conf
index 717047a19b,84cf7ea979..0f800756c3
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@@ -42,13 -42,10 +42,11 @@@ rootdn		"cn=Manager,dc=example,dc=com
  rootpw		secret
  #null#bind		on
  #~null~#directory	@TESTDIR@/db.1.a
- #bdb#index		objectClass	eq
- #bdb#index		cn,sn,uid	pres,eq,sub
+ #indexdb#index		objectClass	eq
+ #indexdb#index		cn,sn,uid	pres,eq,sub
  #bdb#checkpoint		1024 5
- #hdb#index		objectClass	eq
- #hdb#index		cn,sn,uid	pres,eq,sub
  #hdb#checkpoint		1024 5
 +#mdb#maxsize		33554432
  #ndb#dbname db_1
  #ndb#include @DATADIR@/ndb.conf