Commit d3f48228 authored by Rich Prohaska's avatar Rich Prohaska

remove overactive assert in ha_tokudb::external_lock

parent 0fc1a96c
...@@ -6134,17 +6134,17 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) { ...@@ -6134,17 +6134,17 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) {
if (lock_type != F_UNLCK) { if (lock_type != F_UNLCK) {
is_fast_alter_running = false; is_fast_alter_running = false;
use_write_locks = false; use_write_locks = false;
if (lock_type == F_WRLCK) if (lock_type == F_WRLCK) {
use_write_locks = true; use_write_locks = true;
}
if (!trx->tokudb_lock_count++) { if (!trx->tokudb_lock_count++) {
DBUG_ASSERT(trx->stmt == 0); assert(trx->stmt == 0);
transaction = NULL; // Safety transaction = NULL; // Safety
error = create_txn(thd, trx); error = create_txn(thd, trx);
if (error) { if (error) {
goto cleanup; goto cleanup;
} }
} }
assert(thd->in_sub_stmt == 0);
transaction = trx->sub_sp_level; transaction = trx->sub_sp_level;
} }
else { else {
......
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