Commit f683d674 authored by Rich Prohaska's avatar Rich Prohaska

remove reference to set_lk_max. addresses #104

git-svn-id: file:///svn/tokudb@872 c7de825b-a66e-492c-adef-691d508d4ae1
parent 54cd75c6
...@@ -54,10 +54,12 @@ void setup (void) { ...@@ -54,10 +54,12 @@ void setup (void) {
r = db_env_create(&dbenv, 0); r = db_env_create(&dbenv, 0);
assert(r == 0); assert(r == 0);
#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 4
if (dbenv->set_lk_max) { if (dbenv->set_lk_max) {
r = dbenv->set_lk_max(dbenv, ITEMS_PER_TRANSACTION*2); r = dbenv->set_lk_max(dbenv, ITEMS_PER_TRANSACTION*2);
assert(r==0); assert(r==0);
} }
#endif
if (dbenv->set_cachesize) { if (dbenv->set_cachesize) {
r = dbenv->set_cachesize(dbenv, cachesize / (1024*1024*1024), cachesize % (1024*1024*1024), 1); r = dbenv->set_cachesize(dbenv, cachesize / (1024*1024*1024), cachesize % (1024*1024*1024), 1);
......
...@@ -379,10 +379,12 @@ static int toku_db_env_set_lk_detect(DB_ENV * env, u_int32_t detect) { ...@@ -379,10 +379,12 @@ static int toku_db_env_set_lk_detect(DB_ENV * env, u_int32_t detect) {
return 1; return 1;
} }
#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 4
static int toku_db_env_set_lk_max(DB_ENV * env, u_int32_t lk_max) { static int toku_db_env_set_lk_max(DB_ENV * env, u_int32_t lk_max) {
env=env;lk_max=lk_max; env=env;lk_max=lk_max;
return 0; return 0;
} }
#endif
//void __toku_db_env_set_noticecall (DB_ENV *env, void (*noticecall)(DB_ENV *, db_notices)) { //void __toku_db_env_set_noticecall (DB_ENV *env, void (*noticecall)(DB_ENV *, db_notices)) {
// env->i->noticecall = noticecall; // env->i->noticecall = noticecall;
...@@ -441,7 +443,9 @@ int db_env_create(DB_ENV ** envp, u_int32_t flags) { ...@@ -441,7 +443,9 @@ int db_env_create(DB_ENV ** envp, u_int32_t flags) {
result->set_lg_max = toku_db_env_set_lg_max; result->set_lg_max = toku_db_env_set_lg_max;
result->set_cachesize = toku_db_env_set_cachesize; result->set_cachesize = toku_db_env_set_cachesize;
result->set_lk_detect = toku_db_env_set_lk_detect; result->set_lk_detect = toku_db_env_set_lk_detect;
#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR <= 4
result->set_lk_max = toku_db_env_set_lk_max; result->set_lk_max = toku_db_env_set_lk_max;
#endif
result->log_archive = toku_db_env_log_archive; result->log_archive = toku_db_env_log_archive;
result->txn_stat = toku_db_env_txn_stat; result->txn_stat = toku_db_env_txn_stat;
result->txn_begin = toku_txn_begin; result->txn_begin = toku_txn_begin;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment