diff options
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 29b6473d7d4..0aba7fddb51 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -848,10 +848,6 @@ static void print_lock_error(int error, const char *table) So in this exceptional case the COMMIT should not be blocked by the FLUSH TABLES WITH READ LOCK. - TODO in MySQL 5.x: make_global_read_lock_block_commit() should be - killable. Normally CPU does not spend a long time in this function (COMMITs - are quite fast), but it would still be nice. - ****************************************************************************/ volatile uint global_read_lock=0; @@ -1002,7 +998,7 @@ bool make_global_read_lock_block_commit(THD *thd) pthread_cond_wait(&COND_refresh, &LOCK_global_read_lock); DBUG_EXECUTE_IF("make_global_read_lock_block_commit_loop", protect_against_global_read_lock--;); - if (error= thd->killed) + if ((error= test(thd->killed))) global_read_lock_blocks_commit--; // undo what we did else thd->global_read_lock= MADE_GLOBAL_READ_LOCK_BLOCK_COMMIT; |