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

Fixed compile errors when compiling with HAVE_valgrind

Browse Source
This commit is contained in:
Michael Widenius 2021-08-24 23:05:21 +03:00
parent c0a84fb9b0
commit 497b694936
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/field.cc
View File

@ -7692,7 +7692,7 @@ my_decimal *Field_varstring::val_decimal(my_decimal *decimal_value)
#ifdef HAVE_valgrind #ifdef HAVE_valgrind
void Field_varstring::mark_unused_memory_as_defined() void Field_varstring::mark_unused_memory_as_defined()
{ {
uint used_length= get_length(); uint used_length __attribute__((unused)) = get_length();
MEM_MAKE_DEFINED(get_data() + used_length, field_length - used_length); MEM_MAKE_DEFINED(get_data() + used_length, field_length - used_length);
} }
#endif #endif

2
storage/innobase/include/srv0mon.h
View File

@ -656,7 +656,7 @@ Use MONITOR_DEC if appropriate mutex protection exists.
#ifdef HAVE_valgrind #ifdef HAVE_valgrind
# define MONITOR_CHECK_DEFINED(value) do { \ # define MONITOR_CHECK_DEFINED(value) do { \
mon_type_t m = value; \ mon_type_t m __attribute__((unused))= value; \
MEM_CHECK_DEFINED(&m, sizeof m); \ MEM_CHECK_DEFINED(&m, sizeof m); \
} while (0) } while (0)
#else /* HAVE_valgrind */ #else /* HAVE_valgrind */

8
storage/innobase/page/page0cur.cc
View File

@ -1299,9 +1299,9 @@ page_cur_insert_rec_low(
#ifdef HAVE_valgrind #ifdef HAVE_valgrind
{ {
const void* rec_start const void* rec_start __attribute__((unused))
= rec - rec_offs_extra_size(offsets); = rec - rec_offs_extra_size(offsets);
ulint extra_size ulint extra_size __attribute__((unused))
= rec_offs_extra_size(offsets) = rec_offs_extra_size(offsets)
- (rec_offs_comp(offsets) - (rec_offs_comp(offsets)
? REC_N_NEW_EXTRA_BYTES ? REC_N_NEW_EXTRA_BYTES
@ -1530,9 +1530,9 @@ page_cur_insert_rec_zip(
#ifdef HAVE_valgrind #ifdef HAVE_valgrind
{ {
const void* rec_start const void* rec_start __attribute__((unused))
= rec - rec_offs_extra_size(offsets); = rec - rec_offs_extra_size(offsets);
ulint extra_size ulint extra_size __attribute__((unused))
= rec_offs_extra_size(offsets) = rec_offs_extra_size(offsets)
- (rec_offs_comp(offsets) - (rec_offs_comp(offsets)
? REC_N_NEW_EXTRA_BYTES ? REC_N_NEW_EXTRA_BYTES