bzr commit into mysql-trunk-innodb branch (marko.makela:3462)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ based on revid:marko.makela@strippedblf9e9dtedm0

 3462 Marko Mäkelä	2011-01-27
      lock_unlock_table_autoinc(): Relax a debug assertion that was added in
      bzr revision-id marko.makela@stripped110125112705-c16smqlyv2azjpau.
      This function can be called for XA PREPARED transactions, after all.

    modified:
      storage/innobase/lock/lock0lock.c
=== modified file 'storage/innobase/lock/lock0lock.c'
--- a/storage/innobase/lock/lock0lock.c	revid:marko.makela@stripped20110126081028-v3rublf9e9dtedm0
+++ b/storage/innobase/lock/lock0lock.c	revid:marko.makela@stripped24-ph910ewwem1u1ar7
@@ -6121,8 +6121,10 @@ lock_unlock_table_autoinc(
 	ut_ad(!lock_mutex_own());
 	ut_ad(!trx_mutex_own(trx));
 	ut_ad(!trx->lock.wait_lock);
+	/* This can be invoked on NOT_STARTED, ACTIVE, PREPARED,
+	but not COMMITTED transactions. */
 	ut_ad(trx_state_eq(trx, TRX_STATE_NOT_STARTED)
-	      || trx_state_eq(trx, TRX_STATE_ACTIVE));
+	      || !trx_state_eq(trx, TRX_STATE_COMMITTED_IN_MEMORY));
 
 	/* This function is invoked for a running transaction by the
 	thread that is serving the transaction. Therefore it is not

Attachment: [text/bzr-bundle] bzr/[e-mail]