mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Backporting patch for Bug#46650 (Innodb assertion autoinc_lock == lock

Browse source 
in lock_table_remove_low on INSERT SELECT) to mysql-trunk.
This commit is contained in:
Alexander Nozdrin 2009-08-24 10:48:57 +04:00
parent ed1976f143
commit 8b72c02a25
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
storage/innobase/lock/lock0lock.c
View file

@ -3574,7 +3574,8 @@ lock_table_remove_low(
and lock_grant()). Therefore it can be empty and we and lock_grant()). Therefore it can be empty and we
need to check for that. */ need to check for that. */
if (!ib_vector_is_empty(trx->autoinc_locks)) { if (!lock_get_wait(lock)
&& !ib_vector_is_empty(trx->autoinc_locks)) {
lock_t* autoinc_lock; lock_t* autoinc_lock;
autoinc_lock = ib_vector_pop(trx->autoinc_locks); autoinc_lock = ib_vector_pop(trx->autoinc_locks);
@ -3647,8 +3648,10 @@ lock_table_enqueue_waiting(
if (lock_deadlock_occurs(lock, trx)) { if (lock_deadlock_occurs(lock, trx)) {
lock_reset_lock_and_trx_wait(lock); /* The order here is important, we don't want to
lose the state of the lock before calling remove. */
lock_table_remove_low(lock); lock_table_remove_low(lock);
lock_reset_lock_and_trx_wait(lock);
return(DB_DEADLOCK); return(DB_DEADLOCK);
} }