From c00c1b767e8bc6d65ba78e2dedd38ba56cdb3265 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 9 Jun 2010 13:53:51 +0200 Subject: [PATCH] fix questionable UNIV_EXPECT's in the xtradb that confused old gcc. --- storage/xtradb/include/rem0rec.ic | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/storage/xtradb/include/rem0rec.ic b/storage/xtradb/include/rem0rec.ic index 8e5bd9a7fcd..fa96c97f95e 100644 --- a/storage/xtradb/include/rem0rec.ic +++ b/storage/xtradb/include/rem0rec.ic @@ -268,7 +268,7 @@ rec_get_next_ptr_const( return(NULL); } - if (UNIV_EXPECT(comp, REC_OFFS_COMPACT)) { + if (UNIV_LIKELY(comp != 0)) { #if UNIV_PAGE_SIZE <= 32768 /* Note that for 64 KiB pages, field_value can 'wrap around' and the debug assertion is not valid */ @@ -336,7 +336,7 @@ rec_get_next_offs( field_value = mach_read_from_2(rec - REC_NEXT); - if (UNIV_EXPECT(comp, REC_OFFS_COMPACT)) { + if (UNIV_LIKELY(comp != 0)) { #if UNIV_PAGE_SIZE <= 32768 /* Note that for 64 KiB pages, field_value can 'wrap around' and the debug assertion is not valid */ @@ -647,7 +647,7 @@ rec_get_info_and_status_bits( & (REC_INFO_BITS_MASK >> REC_INFO_BITS_SHIFT) # error "REC_NEW_STATUS_MASK and REC_INFO_BITS_MASK overlap" #endif - if (UNIV_EXPECT(comp, REC_OFFS_COMPACT)) { + if (UNIV_LIKELY(comp != 0)) { bits = rec_get_info_bits(rec, TRUE) | rec_get_status(rec); } else { bits = rec_get_info_bits(rec, FALSE); @@ -683,7 +683,7 @@ rec_get_deleted_flag( const rec_t* rec, /*!< in: physical record */ ulint comp) /*!< in: nonzero=compact page format */ { - if (UNIV_EXPECT(comp, REC_OFFS_COMPACT)) { + if (UNIV_LIKELY(comp != 0)) { return(UNIV_UNLIKELY( rec_get_bit_field_1(rec, REC_NEW_INFO_BITS, REC_INFO_DELETED_FLAG,