Commit aa9a0ac9 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

addresses #1782

move change from 2.0.0 to main line

git-svn-id: file:///svn/mysql/tokudb-engine/src@12641 c7de825b-a66e-492c-adef-691d508d4ae1
parent 6dcda10c
...@@ -118,8 +118,12 @@ extern "C" { ...@@ -118,8 +118,12 @@ extern "C" {
static int tokudb_init_func(void *p) { static int tokudb_init_func(void *p) {
TOKUDB_DBUG_ENTER("tokudb_init_func"); TOKUDB_DBUG_ENTER("tokudb_init_func");
int r;
#if defined(_WIN32) #if defined(_WIN32)
toku_ydb_init(); r = toku_ydb_init();
if (r) {
goto error;
}
#endif #endif
tokudb_hton = (handlerton *) p; tokudb_hton = (handlerton *) p;
...@@ -168,7 +172,6 @@ static int tokudb_init_func(void *p) { ...@@ -168,7 +172,6 @@ static int tokudb_init_func(void *p) {
tokudb_log_file_size = max(tokudb_log_file_size, 10 * 1024 * 1024L); tokudb_log_file_size = max(tokudb_log_file_size, 10 * 1024 * 1024L);
DBUG_PRINT("info", ("computing tokudb_log_file_size: %ld\n", tokudb_log_file_size)); DBUG_PRINT("info", ("computing tokudb_log_file_size: %ld\n", tokudb_log_file_size));
#endif #endif
int r;
if ((r = db_env_create(&db_env, 0))) { if ((r = db_env_create(&db_env, 0))) {
DBUG_PRINT("info", ("db_env_create %d\n", r)); DBUG_PRINT("info", ("db_env_create %d\n", r));
goto error; goto error;
......
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