diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2013-05-24 11:23:52 -0400 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2013-05-24 11:23:52 -0400 |
| commit | d3f4822885ffb847d22418fedd1eff671c6701a5 (patch) | |
| tree | b1a1c4a75e4ed9479c1419ab85bd96e0db41daff /storage | |
| parent | 0fc1a96c4ae5f69908df6a200c4f9eaeedf59083 (diff) | |
| download | mariadb-git-d3f4822885ffb847d22418fedd1eff671c6701a5.tar.gz | |
remove overactive assert in ha_tokudb::external_lock
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/tokudb/ha_tokudb.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 689af83f2e4..438d7e73aaf 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -6134,17 +6134,17 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) { if (lock_type != F_UNLCK) { is_fast_alter_running = false; use_write_locks = false; - if (lock_type == F_WRLCK) + if (lock_type == F_WRLCK) { use_write_locks = true; + } if (!trx->tokudb_lock_count++) { - DBUG_ASSERT(trx->stmt == 0); + assert(trx->stmt == 0); transaction = NULL; // Safety error = create_txn(thd, trx); if (error) { goto cleanup; } } - assert(thd->in_sub_stmt == 0); transaction = trx->sub_sp_level; } else { |