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

libraries/liblmdb/Makefile

@@ -48,10 +48,10 @@ PROGS	= $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
 all:	$(ILIBS) $(PROGS)
 
 install: $(ILIBS) $(IPROGS) $(IHDRS)
-	cp $(IPROGS) $(DESTDIR)$(prefix)/bin
-	cp $(ILIBS) $(DESTDIR)$(prefix)/lib
-	cp $(IHDRS) $(DESTDIR)$(prefix)/include
-	cp $(IDOCS) $(DESTDIR)$(prefix)/man/man1
+	for f in $(IPROGS); do cp $$f $(DESTDIR)$(prefix)/bin; done
+	for f in $(ILIBS); do cp $$f $(DESTDIR)$(prefix)/lib; done
+	for f in $(IHDRS); do cp $$f $(DESTDIR)$(prefix)/include; done
+	for f in $(IDOCS); do cp $$f $(DESTDIR)$(prefix)/man/man1; done
 
 clean:
 	rm -rf $(PROGS) *.[ao] *.so *~ testdb

libraries/liblmdb/lmdb.h

@@ -383,7 +383,7 @@ typedef enum MDB_cursor_op {
 #define MDB_PAGE_FULL	(-30786)
 	/** Database contents grew beyond environment mapsize */
 #define MDB_MAP_RESIZED	(-30785)
-	/** Database flags changed or would change */
+	/** MDB_INCOMPATIBLE: Operation and DB incompatible, or DB flags changed */
 #define MDB_INCOMPATIBLE	(-30784)
 	/** Invalid reuse of reader locktable slot */
 #define MDB_BAD_RSLOT		(-30783)
@@ -762,6 +762,12 @@ int  mdb_env_get_maxkeysize(MDB_env *env);
 	 */
 int  mdb_txn_begin(MDB_env *env, MDB_txn *parent, unsigned int flags, MDB_txn **txn);
 
+	/** @brief Returns the transaction's #MDB_env
+	 *
+	 * @param[in] txn A transaction handle returned by #mdb_txn_begin()
+	 */
+MDB_env *mdb_txn_env(MDB_txn *txn);
+
 	/** @brief Commit all the operations of a transaction into the database.
 	 *
 	 * The transaction handle is freed. It and its cursors must not be used