From: Hallvard Furuseth <hallvard@openldap.org>
Date: Wed, 20 Feb 2013 11:19:45 +0000 (+0100)
Subject: Tweak MDB_INCOMPATIBLE description
X-Git-Tag: OPENLDAP_REL_ENG_2_4_34~3^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=80cd88118406acdd5e153c91a6a42c7c90804ac6;p=openldap

Tweak MDB_INCOMPATIBLE description
---

diff --git a/libraries/liblmdb/lmdb.h b/libraries/liblmdb/lmdb.h
index 5b6ff6ef58..029945a608 100644
--- a/libraries/liblmdb/lmdb.h
+++ b/libraries/liblmdb/lmdb.h
@@ -362,7 +362,7 @@ typedef enum MDB_cursor_op {
 #define MDB_PAGE_FULL	(-30786)
 	/** Database contents grew beyond environment mapsize */
 #define MDB_MAP_RESIZED	(-30785)
-	/** Operation is incompatible with database */
+	/** Database flags changed or would change */
 #define MDB_INCOMPATIBLE	(-30784)
 #define MDB_LAST_ERRCODE	MDB_INCOMPATIBLE
 /** @} */
diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index a6193c704d..041acfa8e8 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -1073,7 +1073,7 @@ static char *const mdb_errstr[] = {
 	"MDB_CURSOR_FULL: Internal error - cursor stack limit reached",
 	"MDB_PAGE_FULL: Internal error - page has no more space",
 	"MDB_MAP_RESIZED: Database contents grew beyond environment mapsize",
-	"MDB_INCOMPATIBLE: Operation is incompatible with database",
+	"MDB_INCOMPATIBLE: Database flags changed or would change",
 };
 
 char *