bzr commit into mysql-trunk-innodb branch (marko.makela:3120) Bug#57428

[marko.makela]

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

 3120 Marko Mäkelä	2010-06-24
      After-review cleanup of Bug#57428: replace the dulint struct with a 64-bit int
      
      trx_undo_build_roll_ptr(): Clarify the assertion on is_insert being 0 or 1.
      
      TRX_SYS_FILE_FORMAT_TAG: Remove "extra" space after period in the comment.
      See also http://desktoppub.about.com/cs/typespacing/a/onetwospaces.htm

    modified:
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0undo.ic
=== modified file 'storage/innobase/include/trx0sys.h'
--- a/storage/innobase/include/trx0sys.h	revid:marko.makela@strippedagpd3u6qii6odd
+++ b/storage/innobase/include/trx0sys.h	revid:marko.makela@stripped229
@@ -568,12 +568,12 @@ FIL_PAGE_ARCH_LOG_NO_OR_SPACE_NO. */
 (TRX_SYS_PAGE_NO of TRX_SYS_SPACE) */
 #define TRX_SYS_FILE_FORMAT_TAG		(UNIV_PAGE_SIZE - 16)
 
-/** Contents of TRX_SYS_FILE_FORMAT_TAG when valid.  The file format
+/** Contents of TRX_SYS_FILE_FORMAT_TAG when valid. The file format
 identifier is added to this constant. */
 #define TRX_SYS_FILE_FORMAT_TAG_MAGIC_N_LOW	3645922177UL
 /** Contents of TRX_SYS_FILE_FORMAT_TAG+4 when valid */
 #define TRX_SYS_FILE_FORMAT_TAG_MAGIC_N_HIGH	2745987765UL
-/** Contents of TRX_SYS_FILE_FORMAT_TAG when valid.  The file format
+/** Contents of TRX_SYS_FILE_FORMAT_TAG when valid. The file format
 identifier is added to this 64-bit constant. */
 #define TRX_SYS_FILE_FORMAT_TAG_MAGIC_N					\
 	((ib_uint64_t) TRX_SYS_FILE_FORMAT_TAG_MAGIC_N_HIGH << 32	\

=== modified file 'storage/innobase/include/trx0undo.ic'
--- a/storage/innobase/include/trx0undo.ic	revid:marko.makela@strippedi6odd
+++ b/storage/innobase/include/trx0undo.ic	revid:marko.makela@stripped
@@ -43,7 +43,7 @@ trx_undo_build_roll_ptr(
 #if DATA_ROLL_PTR_LEN != 7
 # error "DATA_ROLL_PTR_LEN != 7"
 #endif
-	ut_ad(is_insert <= 1);
+	ut_ad(is_insert == 0 || is_insert == 1);
 	ut_ad(rseg_id < TRX_SYS_N_RSEGS);
 	ut_ad(offset < 65536);
 

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