Commit 100a2928 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

refs #5469, refs #5481, add comments reminding myself to remove what should...

refs #5469, refs #5481, add comments reminding myself to remove what should hopefully be a useless variable

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@47800 c7de825b-a66e-492c-adef-691d508d4ae1
parent 954ad0d5
...@@ -3289,6 +3289,9 @@ int ha_tokudb::end_bulk_insert(bool abort) { ...@@ -3289,6 +3289,9 @@ int ha_tokudb::end_bulk_insert(bool abort) {
if (error || loader_error) { if (error || loader_error) {
my_errno = error ? error : loader_error; my_errno = error ? error : loader_error;
if (using_loader) { if (using_loader) {
//
// TODO: (Zardosht), remove trx->should_abort as part of
// #5481
trx->should_abort = true; trx->should_abort = true;
share->try_table_lock = true; share->try_table_lock = true;
} }
...@@ -5987,6 +5990,10 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) { ...@@ -5987,6 +5990,10 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) {
DBUG_PRINT("trans", ("commiting non-updating transaction")); DBUG_PRINT("trans", ("commiting non-updating transaction"));
reset_stmt_progress(&trx->stmt_progress); reset_stmt_progress(&trx->stmt_progress);
if (!is_fast_alter_running) { if (!is_fast_alter_running) {
//
// TODO: (Zardosht), remove trx->should_abort as part of
// #5481
//
if (trx->should_abort) { if (trx->should_abort) {
abort_txn(trx->stmt); abort_txn(trx->stmt);
if (tokudb_debug & TOKUDB_DEBUG_TXN) { if (tokudb_debug & TOKUDB_DEBUG_TXN) {
......
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