Merge remote-tracking branch 'origin/mdb.RE/0.9'

diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES
index 710b4772c15ec1718bb806deb300f437ac85b3d6..6e8910d2808c3986e4e1b3a973fe6a7268bf0897 100644 (file)
--- a/libraries/liblmdb/CHANGES
+++ b/libraries/liblmdb/CHANGES
@@ -25,6 +25,7 @@ LMDB 0.9.15 Release Engineering
                Fix mdb_cursor_put,mdb_cursor_del EACCES description
                Fix mdb_env_sync(MDB_RDONLY env) doc (ITS#8021)
                Clarify MDB_WRITEMAP doc (ITS#8021)
+               Clarify mdb_env_open doc
                Clarify mdb_dbi_open doc
 
 LMDB 0.9.14 Release (2014/09/20)

diff --git a/libraries/liblmdb/lmdb.h b/libraries/liblmdb/lmdb.h
index e8aed94418cd57e38eb38ce8e509f5636f428199..d0ce563d2bcd521cefdb86489dd1bc2c8cd31998 100644 (file)
--- a/libraries/liblmdb/lmdb.h
+++ b/libraries/liblmdb/lmdb.h
@@ -588,8 +588,8 @@ int  mdb_env_create(MDB_env **env);
         *              reserved in that case.
         *              This flag may be changed at any time using #mdb_env_set_flags().
         * </ul>
-        * @param[in] mode The UNIX permissions to set on created files. This parameter
-        * is ignored on Windows.
+        * @param[in] mode The UNIX permissions to set on created files and semaphores.
+        * This parameter is ignored on Windows.
         * @return A non-zero error value on failure and 0 on success. Some possible
         * errors are:
         * <ul>