Merge pull request #4289 from clemahieu/lmdb_0_9_31

Update lmdb submodule to version 0.9.31
nanocurrency · Sep 25, 2023 · 7a2ff65 · 7a2ff65
2 parents a40bdcd + 109552f
commit 7a2ff65
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,8 +3,7 @@
 	url = https://github.com/miniupnp/miniupnp.git
 [submodule "lmdb"]
 	path = submodules/lmdb
-	url = https://github.com/nanocurrency/lmdb.git
-	branch = lmdb_0_9_23
+	url = https://github.com/LMDB/lmdb.git
 [submodule "cryptopp"]
 	path = submodules/cryptopp
 	url = https://github.com/weidai11/cryptopp.git

diff --git a/nano/core_test/wallets.cpp b/nano/core_test/wallets.cpp
@@ -73,7 +73,9 @@ TEST (wallets, remove)
 	}
 }
 
-TEST (wallets, reload)
+// Opening multiple environments using the same file within the same process is not supported.
+// http://www.lmdb.tech/doc/starting.html
+TEST (wallets, DISABLED_reload)
 {
 	nano::test::system system (1);
 	auto & node1 (*system.nodes[0]);

diff --git a/submodules/lmdb b/submodules/lmdb
+1 −0		libraries/liblmdb/.gitignore
+0 −252		libraries/liblmdb/CHANGES
+1 −1		libraries/liblmdb/COPYRIGHT
+6 −5		libraries/liblmdb/Makefile
+1 −1		libraries/liblmdb/intro.doc
+66 −21		libraries/liblmdb/lmdb.h
+1,548 −509		libraries/liblmdb/mdb.c
+8 −2		libraries/liblmdb/mdb_copy.1
+4 −2		libraries/liblmdb/mdb_copy.c
+40 −0		libraries/liblmdb/mdb_drop.1
+135 −0		libraries/liblmdb/mdb_drop.c
+8 −2		libraries/liblmdb/mdb_dump.1
+10 −10		libraries/liblmdb/mdb_dump.c
+8 −1		libraries/liblmdb/mdb_load.1
+63 −28		libraries/liblmdb/mdb_load.c
+8 −2		libraries/liblmdb/mdb_stat.1
+23 −22		libraries/liblmdb/mdb_stat.c
+64 −2		libraries/liblmdb/midl.c
+18 −4		libraries/liblmdb/midl.h
+1 −1		libraries/liblmdb/mtest.c
+1 −1		libraries/liblmdb/mtest2.c
+1 −1		libraries/liblmdb/mtest3.c
+1 −1		libraries/liblmdb/mtest4.c
+1 −1		libraries/liblmdb/mtest5.c
+1 −1		libraries/liblmdb/mtest6.c
+1 −1		libraries/liblmdb/sample-bdb.txt
+1 −1		libraries/liblmdb/sample-mdb.txt
+5 −0		libraries/liblmdb/tooltag