Commit 69b3d73a authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

addresses #1066

remove overactive assert

git-svn-id: file:///svn/mysql/tokudb-engine/src@5476 c7de825b-a66e-492c-adef-691d508d4ae1
parent 5c938aae
...@@ -3461,7 +3461,6 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) { ...@@ -3461,7 +3461,6 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) {
else { else {
if (thd->in_lock_tables) { if (thd->in_lock_tables) {
assert(trx->all != NULL); assert(trx->all != NULL);
assert(lock.type == TL_WRITE || lock.type == TL_READ_NO_INSERT);
// //
// For the command "Lock tables foo read, bar read" // For the command "Lock tables foo read, bar read"
// This statement is grabbing the locks for the table // This statement is grabbing the locks for the table
...@@ -3469,10 +3468,10 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) { ...@@ -3469,10 +3468,10 @@ int ha_tokudb::external_lock(THD * thd, int lock_type) {
// trx->tokudb_lock_count is 0 and we are initializing // trx->tokudb_lock_count is 0 and we are initializing
// trx->all above // trx->all above
// //
if (lock.type == TL_READ_NO_INSERT) { if (lock.type <= TL_READ_NO_INSERT) {
error = acquire_table_lock(trx->all,lock_read); error = acquire_table_lock(trx->all,lock_read);
} }
else if (lock.type == TL_WRITE) { else {
error = acquire_table_lock(trx->all,lock_write); error = acquire_table_lock(trx->all,lock_write);
} }
if (error) {trx->tokudb_lock_count--; goto cleanup;} if (error) {trx->tokudb_lock_count--; goto cleanup;}
......
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