Commit 168f9591 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

addresses #1718

Yoni's CR comments

git-svn-id: file:///svn/mysql/tokudb-engine/src@11477 c7de825b-a66e-492c-adef-691d508d4ae1
parent b707ce4b
...@@ -2421,7 +2421,10 @@ cleanup: ...@@ -2421,7 +2421,10 @@ cleanup:
error = sub_trans->commit(sub_trans, DB_TXN_NOSYNC); error = sub_trans->commit(sub_trans, DB_TXN_NOSYNC);
} }
} }
assert(!db_env->checkpointing_end_atomic_operation(db_env)); {
int r = db_env->checkpointing_end_atomic_operation(db_env);
assert(r==0);
}
TOKUDB_DBUG_RETURN(error); TOKUDB_DBUG_RETURN(error);
} }
...@@ -2640,7 +2643,10 @@ cleanup: ...@@ -2640,7 +2643,10 @@ cleanup:
error = sub_trans->commit(sub_trans, DB_TXN_NOSYNC); error = sub_trans->commit(sub_trans, DB_TXN_NOSYNC);
} }
} }
assert(!db_env->checkpointing_end_atomic_operation(db_env)); {
int r = db_env->checkpointing_end_atomic_operation(db_env);
assert(r==0);
}
TOKUDB_DBUG_RETURN(error); TOKUDB_DBUG_RETURN(error);
} }
...@@ -2762,7 +2768,10 @@ int ha_tokudb::delete_row(const uchar * record) { ...@@ -2762,7 +2768,10 @@ int ha_tokudb::delete_row(const uchar * record) {
thd_proc_info(thd, write_status_msg); thd_proc_info(thd, write_status_msg);
} }
} }
assert(!db_env->checkpointing_end_atomic_operation(db_env)); {
int r = db_env->checkpointing_end_atomic_operation(db_env);
assert(r==0);
}
TOKUDB_DBUG_RETURN(error); TOKUDB_DBUG_RETURN(error);
} }
...@@ -4597,7 +4606,10 @@ int ha_tokudb::rename_table(const char *from, const char *to) { ...@@ -4597,7 +4606,10 @@ int ha_tokudb::rename_table(const char *from, const char *to) {
} }
cleanup: cleanup:
assert(!db_env->checkpointing_resume(db_env)); {
int r = db_env->checkpointing_resume(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));
TOKUDB_DBUG_RETURN(error); TOKUDB_DBUG_RETURN(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