From 1ae7da653e5894bb78ff380626c80a838a034195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@oracle.com> Date: Thu, 24 Jun 2010 09:09:29 +0300 Subject: [PATCH] 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 --- storage/innobase/include/trx0sys.h | 4 ++-- storage/innobase/include/trx0undo.ic | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h index d696537716..63e3f6be93 100644 --- a/storage/innobase/include/trx0sys.h +++ b/storage/innobase/include/trx0sys.h @@ -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 \ diff --git a/storage/innobase/include/trx0undo.ic b/storage/innobase/include/trx0undo.ic index cc7d76dffe..b81330f7f8 100644 --- a/storage/innobase/include/trx0undo.ic +++ b/storage/innobase/include/trx0undo.ic @@ -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); -- 2.30.9