diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 3cf5264d..779876a1 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -15,7 +15,7 @@ add_subdirectory(miniupnp/miniupnpc) set_property(TARGET libminiupnpc-static PROPERTY FOLDER "contrib") set_property(TARGET zlibstatic PROPERTY FOLDER "contrib") -set_property(TARGET mdbx-static PROPERTY FOLDER "contrib") +set_property(TARGET mdbx PROPERTY FOLDER "contrib") set_property(TARGET lmdb PROPERTY FOLDER "contrib") set_property(TARGET upnpc-static mdbx_chk mdbx_copy mdbx_dump mdbx_load mdbx_stat PROPERTY FOLDER "unused") diff --git a/contrib/db/libmdbx b/contrib/db/libmdbx index 0e2ca3eb..b7ed6754 160000 --- a/contrib/db/libmdbx +++ b/contrib/db/libmdbx @@ -1 +1 @@ -Subproject commit 0e2ca3eb515d6939513a29321aaf13678f682e8b +Subproject commit b7ed67543fefb0878dba1c70dea2a81201041314 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5e71c397..807d2a16 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -155,7 +155,7 @@ add_dependencies(stratum version ${PCH_LIB_NAME}) ENABLE_SHARED_PCH(stratum STRATUM) -target_link_libraries(currency_core lmdb mdbx-static) +target_link_libraries(currency_core lmdb mdbx) add_executable(daemon ${DAEMON} ${P2P} ${CURRENCY_PROTOCOL}) add_dependencies(daemon version) diff --git a/src/common/db_backend_mdbx.cpp b/src/common/db_backend_mdbx.cpp index 1a048c9c..3307dec8 100644 --- a/src/common/db_backend_mdbx.cpp +++ b/src/common/db_backend_mdbx.cpp @@ -143,10 +143,10 @@ namespace tools else { int res = 0; - MDBX_txn_flags_t flags = MDBX_txn_flags_t(); - unsigned int flags_ = 0; + //MDBX_txn_flags_t flags = MDBX_txn_flags_t(); + unsigned int flags = 0; if (read_only) - flags = MDBX_TXN_RDONLY; + flags = MDBX_RDONLY;//flags = MDBX_TXN_RDONLY; //don't use parent tx in write transactions if parent tx was read-only (restriction in mdbx) //see "Nested transactions: Max 1 child, write txns only, no writemap" @@ -341,7 +341,8 @@ namespace tools data[0].iov_base = (void*)v; data[0].iov_len = vs; - MDBX_put_flags_t flags = MDBX_put_flags_t(); + //MDBX_put_flags_t flags = MDBX_put_flags_t(); + unsigned flags = 0; res = mdbx_put(get_current_tx(), static_cast(h), &key, data, flags); CHECK_AND_ASSERT_MESS_MDBX_DB(res, false, "Unable to mdbx_put"); return true;