mdb.master3
Hallvard Furuseth 7 years ago committed by Howard Chu
parent 24f437df86
commit 61b5b6270d
  1. 4
      libraries/liblmdb/lmdb.h
  2. 6
      libraries/liblmdb/mdb.c

@ -995,8 +995,8 @@ int mdb_env_set_assert(MDB_env *env, MDB_assert_func *func);
#if MDB_RPAGE_CACHE #if MDB_RPAGE_CACHE
/** @brief Set encryption on an environment. /** @brief Set encryption on an environment.
* *
* This must be called before #mdb_env_open(). It implicitly sets #MDB_REMAP_CHUNK * This must be called before #mdb_env_open().
* on the env. * It implicitly sets #MDB_REMAP_CHUNKS on the env.
* @param[in] env An environment handle returned by #mdb_env_create(). * @param[in] env An environment handle returned by #mdb_env_create().
* @param[in] func An #MDB_enc_func function. * @param[in] func An #MDB_enc_func function.
* @param[in] key An array of two values: key[0] is the encryption key, * @param[in] key An array of two values: key[0] is the encryption key,

@ -471,7 +471,7 @@ typedef pthread_mutex_t *mdb_mutexref_t;
#define MNAME_LEN (sizeof(pthread_mutex_t)) #define MNAME_LEN (sizeof(pthread_mutex_t))
#endif #endif
/** Initial part of #MDB_env.me_mutexname[]. /** Initial part of #MDB_env.%me_mutexname[].
* Changes to this code must be reflected in #MDB_LOCK_FORMAT. * Changes to this code must be reflected in #MDB_LOCK_FORMAT.
*/ */
#ifdef _WIN32 #ifdef _WIN32
@ -6322,7 +6322,8 @@ static void mdb_rpage_decrypt(MDB_env *env, MDB_ID3 *id3, int rem, int numpgs);
* reference to one overflow page at a time. * reference to one overflow page at a time.
* *
* @param[in] txn the transaction for this access. * @param[in] txn the transaction for this access.
* @param[in] pgno the page number for the page to retrieve. * @param[in] pg0 the page number for the page to retrieve.
* @param[in] numpgs number of database pages (can be > 1 for overflow pages)
* @param[out] ret address of a pointer where the page's address will be stored. * @param[out] ret address of a pointer where the page's address will be stored.
* @return 0 on success, non-zero on failure. * @return 0 on success, non-zero on failure.
*/ */
@ -6652,6 +6653,7 @@ static void mdb_rpage_dispose(MDB_env *env, MDB_ID3 *id3)
* Set #MDB_TXN_ERROR on failure. * Set #MDB_TXN_ERROR on failure.
* @param[in] mc the cursor accessing the page. * @param[in] mc the cursor accessing the page.
* @param[in] pgno the page number for the page to retrieve. * @param[in] pgno the page number for the page to retrieve.
* @param[in] numpgs number of database pages (can be > 1 for overflow pages)
* @param[out] ret address of a pointer where the page's address will be stored. * @param[out] ret address of a pointer where the page's address will be stored.
* @param[out] lvl dirty_list inheritance level of found page. 1=current txn, 0=mapped page. * @param[out] lvl dirty_list inheritance level of found page. 1=current txn, 0=mapped page.
* @return 0 on success, non-zero on failure. * @return 0 on success, non-zero on failure.

Loading…
Cancel
Save