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

 3447 Marko Mäkelä	2011-01-21
      Move a misplaced debug assertion to the correct function.
      This mistake was introduced in bzr revision id
      marko.makela@stripped.

    modified:
      storage/innobase/lock/lock0lock.c
=== modified file 'storage/innobase/lock/lock0lock.c'
--- a/storage/innobase/lock/lock0lock.c	revid:marko.makela@oracle.com-20110120141524-mynpxg0w0cd9oihg
+++ b/storage/innobase/lock/lock0lock.c	revid:marko.makela@stripped20223238-fhki0bl1bd8aapoa
@@ -6197,6 +6197,8 @@ lock_unlock_table_autoinc(
 	trx_t*	trx)	/*!< in/out: transaction */
 {
 	ut_ad(!lock_mutex_own());
+	ut_ad(!trx_mutex_own(trx));
+
 	/* This function is invoked for a running transaction by the
 	thread that is serving the transaction. Therefore it is not
 	necessary to hold trx->mutex here. */
@@ -6336,7 +6338,6 @@ lock_table_locks_check(
 
 	ut_a(table != NULL);
 	ut_ad(lock_mutex_own());
-	ut_ad(!trx_mutex_own(trx));
 
 	rw_lock_s_lock(&trx_sys->lock);
 

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20110120223238-fhki0bl1bd8aapoa.bundle
Thread
bzr commit into mysql-trunk-innodb branch (marko.makela:3447) marko.makela20 Jan