Commit 1b9d63c3 authored by sunny's avatar sunny

Fix Bug#22819, remove assertion. (http://bugs.mysql.com/bug.php?id=22819)

parent a676ff46
...@@ -4423,12 +4423,9 @@ lock_table_queue_validate( ...@@ -4423,12 +4423,9 @@ lock_table_queue_validate(
dict_table_t* table) /* in: table */ dict_table_t* table) /* in: table */
{ {
lock_t* lock; lock_t* lock;
ibool is_waiting;
ut_ad(mutex_own(&kernel_mutex)); ut_ad(mutex_own(&kernel_mutex));
is_waiting = FALSE;
lock = UT_LIST_GET_FIRST(table->locks); lock = UT_LIST_GET_FIRST(table->locks);
while (lock) { while (lock) {
...@@ -4438,13 +4435,10 @@ lock_table_queue_validate( ...@@ -4438,13 +4435,10 @@ lock_table_queue_validate(
if (!lock_get_wait(lock)) { if (!lock_get_wait(lock)) {
ut_a(!is_waiting);
ut_a(!lock_table_other_has_incompatible( ut_a(!lock_table_other_has_incompatible(
lock->trx, 0, table, lock->trx, 0, table,
lock_get_mode(lock))); lock_get_mode(lock)));
} else { } else {
is_waiting = TRUE;
ut_a(lock_table_has_to_wait_in_queue(lock)); ut_a(lock_table_has_to_wait_in_queue(lock));
} }
......
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