Commit 63c915c7 authored by unknown's avatar unknown
Browse files

InnoDB: LOCK TABLES clean-up, part 2 


innobase/lock/lock0lock.c:
  Decrement n_lock_table_exp in lock_table_dequeue(), not elsewhere
parent fbc420ba

innobase/lock/lock0lock.c

+4 −2
Original line number Diff line number Diff line
@@ -3509,6 +3509,10 @@ lock_table_dequeue( 


	lock_table_remove_low(in_lock);



	if (lock_get_type(in_lock) == LOCK_TABLE_EXP) {

		in_lock->trx->n_lock_table_exp--;

	}

	

	/* Check if waiting locks in the queue can now be granted: grant

	locks if there are no conflicting locks ahead. */
@@ -3609,7 +3613,6 @@ lock_release_off_kernel( 
			if (lock_get_type(lock) == LOCK_TABLE_EXP) {

				ut_a(lock_get_mode(lock) == LOCK_S

					|| lock_get_mode(lock) == LOCK_X);

				trx->n_lock_table_exp--;

			}

		}
@@ -3676,7 +3679,6 @@ lock_release_tables_off_kernel( 
			}



			lock_table_dequeue(lock);

			trx->n_lock_table_exp--;



			lock = UT_LIST_GET_LAST(trx->trx_locks);

			continue;