List:Commits« Previous MessageNext Message »
From:Sunny Bains Date:April 23 2010 7:53am
Subject:bzr push into mysql-trunk-innodb branch (Sunny.Bains:3038 to 3039)
View as plain text  
 3039 Sunny Bains	2010-04-23
      Add a debug assertion for the case where the waiting thread is being woken
      up because of a lock wait timeout.

    modified:
      storage/innobase/srv/srv0srv.c
 3038 Sunny Bains	2010-04-23
      Fix a race condition introduced by r7004. We need to acquire the srv_sys->mutex
      for all other cases where we release a suspended thread waiting on a lock other
      than those released by the lock wait timer thread.

    modified:
      storage/innobase/include/trx0trx.h
      storage/innobase/srv/srv0srv.c
      storage/innobase/trx/trx0trx.c
=== modified file 'storage/innobase/srv/srv0srv.c'
--- a/storage/innobase/srv/srv0srv.c	2010-04-23 05:19:17 +0000
+++ b/storage/innobase/srv/srv0srv.c	2010-04-23 07:52:09 +0000
@@ -1775,6 +1775,8 @@ srv_release_mysql_thread_if_suspended(
 
 	if (!thr_get_trx(thr)->lock_wait_timeout) {
 		srv_sys_mutex_enter();
+	} else {
+		ut_ad(srv_sys_mutex_own());
 	}
 
 	if (thr->slot != NULL && thr->slot->in_use && thr->slot->thr == thr) {


Attachment: [text/bzr-bundle] bzr/sunny.bains@oracle.com-20100423075209-vqiklw66rncpcq8d.bundle
Thread
bzr push into mysql-trunk-innodb branch (Sunny.Bains:3038 to 3039) Sunny Bains23 Apr