bzr push into mysql-trunk-innodb branch (marko.makela:3446 to 3447)

[marko.makela]

 3447 Marko Mäkelä	2011-01-21
      Move a misplaced debug assertion to the correct function.
      This mistake was introduced in bzr revision id
      [e-mail]-20110120141524-mynpxg0w0cd9oihg.

    modified:
      storage/innobase/lock/lock0lock.c
 3446 Marko Mäkelä	2011-01-20
      Add some debug assertions and correct some comments.
      This is part of the WL#5458 clean-up.

    modified:
      storage/innobase/include/lock0lock.h
      storage/innobase/lock/lock0lock.c
      storage/innobase/trx/trx0trx.c
=== modified file 'storage/innobase/lock/lock0lock.c'
--- a/storage/innobase/lock/lock0lock.c	revid:marko.makela@stripped0cd9oihg
+++ b/storage/innobase/lock/lock0lock.c	revid:marko.makela@stripped
@@ -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/[e-mail]