Commit 5915359d authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:2572], fix crash in case create_loader fails

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@19863 c7de825b-a66e-492c-adef-691d508d4ae1
parent 95251209
...@@ -2843,7 +2843,10 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) { ...@@ -2843,7 +2843,10 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) {
mult_dbt_flags, mult_dbt_flags,
0 0
); );
if (error) { assert(loader == NULL); } if (error) {
assert(loader == NULL);
goto exit_try_table_lock;
}
lc.thd = thd; lc.thd = thd;
lc.ha = this; lc.ha = this;
...@@ -2855,6 +2858,7 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) { ...@@ -2855,6 +2858,7 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) {
assert(!error); assert(!error);
} }
} }
exit_try_table_lock:
pthread_mutex_lock(&share->mutex); pthread_mutex_lock(&share->mutex);
share->try_table_lock = false; share->try_table_lock = false;
pthread_mutex_unlock(&share->mutex); pthread_mutex_unlock(&share->mutex);
......
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