List:Commits« Previous MessageNext Message »
From:marko.makela Date:January 20 2011 9:50am
Subject:bzr commit into mysql-trunk-innodb branch (marko.makela:3445)
View as plain text  
#At file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ based on revid:marko.makela@strippedlwul43pbywsy

 3445 Marko Mäkelä	2011-01-20
      Clarify the protection rules of trx_lock_t::wait_thr.

    modified:
      storage/innobase/include/trx0trx.h
=== modified file 'storage/innobase/include/trx0trx.h'
--- a/storage/innobase/include/trx0trx.h	revid:marko.makela@strippedom-20110120094755-2nlplwul43pbywsy
+++ b/storage/innobase/include/trx0trx.h	revid:marko.makela@stripped095049-4xvjivqcldghi77b
@@ -431,9 +431,13 @@ struct trx_lock_struct {
 	time_t		wait_started;	/*!< lock wait started at this time,
 					protected only by lock_sys->mutex */
 
-	que_thr_t*	wait_thr;	/*!< query thread beloging to this
+	que_thr_t*	wait_thr;	/*!< query thread belonging to this
 					trx that is in QUE_THR_LOCK_WAIT
-				       	state */
+				       	state. For threads suspended in a
+					lock wait, this is protected by
+					lock_sys->mutex. Otherwise, this may
+					only be modified by the thread that is
+					serving the running transaction. */
 
 	mem_heap_t*	lock_heap;	/*!< memory heap for trx_locks;
 					protected by lock_sys->mutex */

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20110120095049-4xvjivqcldghi77b.bundle
Thread
bzr commit into mysql-trunk-innodb branch (marko.makela:3445) marko.makela20 Jan