Commit 365bd6eb authored by heikki@donna.mysql.fi's avatar heikki@donna.mysql.fi
Browse files

srv0srv.c: 

  Fix a seg fault if a lock wait timeout is exceeded at the some time someone grants the lock
parent fb1f8c4f

innobase/srv/srv0srv.c

+8 −4
Original line number Diff line number Diff line
@@ -2144,13 +2144,17 @@ srv_lock_timeout_and_monitor_thread( 
				/* 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 */



			        if (thr_get_trx(slot->thr)->wait_lock) {

				        lock_cancel_waiting_and_release(

				          thr_get_trx(slot->thr)->wait_lock);

			        }

			}

		}

	}



	os_event_reset(srv_lock_timeout_thread_event);