Initial round of changes for 2.3 beta

[openldap] / servers / slapd / back-bdb / dbcache.c

diff --git a/servers/slapd/back-bdb/dbcache.c b/servers/slapd/back-bdb/dbcache.c
index 3885b4c09a0e828db6ffc86cd776deacec7e95b5..faf1d3d1594872a31aef4b2baad1144ecef2a318 100644 (file)
--- a/servers/slapd/back-bdb/dbcache.c
+++ b/servers/slapd/back-bdb/dbcache.c
@@ -124,6 +124,11 @@ bdb_db_cache(
        if ( !( slapMode & SLAP_TOOL_QUICK ))
                flags |= DB_AUTO_COMMIT;
 #endif
+       /* Cannot Truncate when Transactions are in use */
+       if ( (slapMode & (SLAP_TOOL_QUICK|SLAP_TRUNCATE_MODE)) ==
+               (SLAP_TOOL_QUICK|SLAP_TRUNCATE_MODE))
+                       flags |= DB_TRUNCATE;
+
        rc = DB_OPEN( db->bdi_db,
                file, NULL /* name */,
                BDB_INDEXTYPE, bdb->bi_db_opflags | flags, bdb->bi_dbenv_mode );