database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Import branches/zip@r6960 from SVN on top of storage/innodb_plugin

Browse Source
This commit is contained in:
Vasil Dimov
2010-04-07 19:53:14 +03:00
parent 46e5bbaa24 167b68fecb
commit c834fa0260
57 changed files with 1532 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
storage/innodb_plugin/srv/srv0srv.c
View File

@@ -1609,8 +1609,9 @@ srv_suspend_mysql_thread(
innodb_lock_wait_timeout, because trx->mysql_thd == NULL. */
lock_wait_timeout = thd_lock_wait_timeout(trx->mysql_thd);
if (lock_wait_timeout < 100000000
&& wait_time > (double) lock_wait_timeout) {
if (trx_is_interrupted(trx)
|| (lock_wait_timeout < 100000000
&& wait_time > (double) lock_wait_timeout)) {
trx->error_state = DB_LOCK_WAIT_TIMEOUT;
}
@@ -2158,9 +2159,10 @@ loop:
lock_wait_timeout = thd_lock_wait_timeout(
trx->mysql_thd);
if (lock_wait_timeout < 100000000
&& (wait_time > (double) lock_wait_timeout
|| wait_time < 0)) {
if (trx_is_interrupted(trx)
|| (lock_wait_timeout < 100000000
&& (wait_time > (double) lock_wait_timeout
|| wait_time < 0))) {
/* Timeout exceeded or a wrap-around in system
time counter: cancel the lock request queued