Commit 4762c422 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:2726], reset share->try_table_lock for all error paths

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@21101 c7de825b-a66e-492c-adef-691d508d4ae1
parent 24d7fed2
...@@ -2903,6 +2903,7 @@ int ha_tokudb::end_bulk_insert() { ...@@ -2903,6 +2903,7 @@ int ha_tokudb::end_bulk_insert() {
TOKUDB_DBUG_ENTER("ha_tokudb::end_bulk_insert"); TOKUDB_DBUG_ENTER("ha_tokudb::end_bulk_insert");
int error = 0; int error = 0;
THD* thd = ha_thd(); THD* thd = ha_thd();
bool using_loader = (loader != NULL);
if (ai_metadata_update_required) { if (ai_metadata_update_required) {
pthread_mutex_lock(&share->mutex); pthread_mutex_lock(&share->mutex);
error = update_max_auto_inc(share->status_block, share->last_auto_increment); error = update_max_auto_inc(share->status_block, share->last_auto_increment);
...@@ -2960,6 +2961,9 @@ int ha_tokudb::end_bulk_insert() { ...@@ -2960,6 +2961,9 @@ int ha_tokudb::end_bulk_insert() {
bzero(&lc,sizeof(lc)); bzero(&lc,sizeof(lc));
if (error || loader_error) { if (error || loader_error) {
my_errno = error ? error : loader_error; my_errno = error ? error : loader_error;
if (using_loader) {
share->try_table_lock = true;
}
} }
TOKUDB_DBUG_RETURN(error ? error : loader_error); TOKUDB_DBUG_RETURN(error ? error : loader_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