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

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:vasil.dimov@strippedma644icamh1

 3128 Marko Mäkelä	2010-06-01
      Merge from mysql-5.1-innodb:
      
        ------------------------------------------------------------
        revno: 3478.1.4
        revision-id: marko.makela@stripped00525125352-hgafpmqhrrj7pv5i
        parent: [e-mail]-20100525123748-pmpehbg29oyhc1ns
        committer: Marko Mäkelä <marko.makela@stripped>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-25 15:53:52 +0300
        message:
          row_search_for_mysql(): Add assertions to track down Bug #53627.

    modified:
      storage/innobase/row/row0sel.c
=== modified file 'storage/innobase/row/row0sel.c'
--- a/storage/innobase/row/row0sel.c	revid:vasil.dimov@stripped2341-x2d4hma644icamh1
+++ b/storage/innobase/row/row0sel.c	revid:marko.makela@strippedi71z1v
@@ -3611,6 +3611,13 @@ shortcut_fails_too_big_rec:
 		trx->has_search_latch = FALSE;
 	}
 
+	ut_ad(prebuilt->sql_stat_start || trx->conc_state == TRX_ACTIVE);
+	ut_ad(trx->conc_state == TRX_NOT_STARTED
+	      || trx->conc_state == TRX_ACTIVE);
+	ut_ad(prebuilt->sql_stat_start
+	      || prebuilt->select_lock_type != LOCK_NONE
+	      || trx->read_view);
+
 	trx_start_if_not_started(trx);
 
 	if (trx->isolation_level <= TRX_ISO_READ_COMMITTED

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