Commit 0a3691f1 authored by Yoni Fogel's avatar Yoni Fogel

Addresses #2042 refs[t:2042] Fix race condition at lower level.

git-svn-id: file:///svn/mysql/tokudb-engine/src@14802 c7de825b-a66e-492c-adef-691d508d4ae1
parent 5e5b2089
...@@ -5012,8 +5012,6 @@ int ha_tokudb::delete_table(const char *name) { ...@@ -5012,8 +5012,6 @@ int ha_tokudb::delete_table(const char *name) {
// this can only fail if we have not opened the environment // this can only fail if we have not opened the environment
// yet. I want to assert that rather than check for the error // yet. I want to assert that rather than check for the error
// //
error = db_env->checkpointing_begin_atomic_operation(db_env);
assert(!error);
error = db_env->checkpointing_postpone(db_env); error = db_env->checkpointing_postpone(db_env);
assert(!error); assert(!error);
...@@ -5035,8 +5033,6 @@ cleanup: ...@@ -5035,8 +5033,6 @@ cleanup:
int r; int r;
r = db_env->checkpointing_resume(db_env); r = db_env->checkpointing_resume(db_env);
assert(r==0); assert(r==0);
r = db_env->checkpointing_end_atomic_operation(db_env);
assert(r==0);
} }
my_free(newname, MYF(MY_ALLOW_ZERO_PTR)); my_free(newname, MYF(MY_ALLOW_ZERO_PTR));
pthread_mutex_unlock(&tokudb_meta_mutex); pthread_mutex_unlock(&tokudb_meta_mutex);
...@@ -5064,8 +5060,6 @@ int ha_tokudb::rename_table(const char *from, const char *to) { ...@@ -5064,8 +5060,6 @@ int ha_tokudb::rename_table(const char *from, const char *to) {
// this can only fail if we have not opened the environment // this can only fail if we have not opened the environment
// yet. I want to assert that rather than check for the error // yet. I want to assert that rather than check for the error
// //
error = db_env->checkpointing_begin_atomic_operation(db_env);
assert(!error);
error = db_env->checkpointing_postpone(db_env); error = db_env->checkpointing_postpone(db_env);
assert(!error); assert(!error);
...@@ -5098,8 +5092,6 @@ cleanup: ...@@ -5098,8 +5092,6 @@ cleanup:
int r; int r;
r = db_env->checkpointing_resume(db_env); r = db_env->checkpointing_resume(db_env);
assert(r==0); assert(r==0);
r = db_env->checkpointing_end_atomic_operation(db_env);
assert(r==0);
} }
my_free(newfrom, MYF(MY_ALLOW_ZERO_PTR)); my_free(newfrom, MYF(MY_ALLOW_ZERO_PTR));
my_free(newto, MYF(MY_ALLOW_ZERO_PTR)); my_free(newto, MYF(MY_ALLOW_ZERO_PTR));
......
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