database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
monty@hundin.mysql.fi
2001-11-22 14:40:38 +02:00
parent 9209210d30 a2a838f887
commit 9265a4df45
10 changed files with 62 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
innobase/srv/srv0srv.c
View File

@ -2153,10 +2153,14 @@ loop:
/* Timeout exceeded or a wrap-around in system
time counter: cancel the lock request queued
by the transaction and release possible
other transactions waiting behind */
other transactions waiting behind; it is
possible that the lock has already been
granted: in that case do nothing */
lock_cancel_waiting_and_release(
thr_get_trx(slot->thr)->wait_lock);
if (thr_get_trx(slot->thr)->wait_lock) {
lock_cancel_waiting_and_release(
thr_get_trx(slot->thr)->wait_lock);
}
}
}
}