1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix questionable UNIV_EXPECT's in the xtradb that confused old gcc.

Browse Source
This commit is contained in:
Sergei Golubchik 2010-06-09 13:53:51 +02:00
parent 0fc39acb81
commit c00c1b767e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage/xtradb/include/rem0rec.ic
View File

@ -268,7 +268,7 @@ rec_get_next_ptr_const(
return(NULL); return(NULL);
} }
if (UNIV_EXPECT(comp, REC_OFFS_COMPACT)) { if (UNIV_LIKELY(comp != 0)) {
#if UNIV_PAGE_SIZE <= 32768 #if UNIV_PAGE_SIZE <= 32768
/* Note that for 64 KiB pages, field_value can 'wrap around' /* Note that for 64 KiB pages, field_value can 'wrap around'
and the debug assertion is not valid */ and the debug assertion is not valid */
@ -336,7 +336,7 @@ rec_get_next_offs(
field_value = mach_read_from_2(rec - REC_NEXT); 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 #if UNIV_PAGE_SIZE <= 32768
/* Note that for 64 KiB pages, field_value can 'wrap around' /* Note that for 64 KiB pages, field_value can 'wrap around'
and the debug assertion is not valid */ 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) & (REC_INFO_BITS_MASK >> REC_INFO_BITS_SHIFT)
# error "REC_NEW_STATUS_MASK and REC_INFO_BITS_MASK overlap" # error "REC_NEW_STATUS_MASK and REC_INFO_BITS_MASK overlap"
#endif #endif
if (UNIV_EXPECT(comp, REC_OFFS_COMPACT)) { if (UNIV_LIKELY(comp != 0)) {
bits = rec_get_info_bits(rec, TRUE) | rec_get_status(rec); bits = rec_get_info_bits(rec, TRUE) | rec_get_status(rec);
} else { } else {
bits = rec_get_info_bits(rec, FALSE); bits = rec_get_info_bits(rec, FALSE);
@ -683,7 +683,7 @@ rec_get_deleted_flag(
const rec_t* rec, /*!< in: physical record */ const rec_t* rec, /*!< in: physical record */
ulint comp) /*!< in: nonzero=compact page format */ ulint comp) /*!< in: nonzero=compact page format */
{ {
if (UNIV_EXPECT(comp, REC_OFFS_COMPACT)) { if (UNIV_LIKELY(comp != 0)) {
return(UNIV_UNLIKELY( return(UNIV_UNLIKELY(
rec_get_bit_field_1(rec, REC_NEW_INFO_BITS, rec_get_bit_field_1(rec, REC_NEW_INFO_BITS,
REC_INFO_DELETED_FLAG, REC_INFO_DELETED_FLAG,