mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed that compile-pentium64-valgrind-max works

Browse source 
- Removed Tokudb (no need to test this anymore with valgrind)
- Added __attribute__(unused)) to a few places to be able to compile even
  if valgrind/memcheck.h is not installed.

Reviewer: Marko Mäkelä <marko.makela@mariadb.com>
This commit is contained in:
Monty 2021-06-02 14:05:12 +03:00
parent d3d2c96567
commit fa0bbff032
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BUILD/compile-pentium64-valgrind-max
View file

@ -33,6 +33,6 @@ path=`dirname $0`
. "$path/SETUP.sh" . "$path/SETUP.sh"
extra_flags="$pentium64_cflags $debug_cflags $valgrind_flags" extra_flags="$pentium64_cflags $debug_cflags $valgrind_flags"
extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs" extra_configs="$pentium_configs $debug_configs $valgrind_configs $max_configs --without-plugin-tokudb"
. "$path/FINISH.sh" . "$path/FINISH.sh"

2
sql/field.cc
View file

@ -7806,7 +7806,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 */

26
storage/innobase/page/page0cur.cc
View file

@ -1299,12 +1299,12 @@ 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
: REC_N_OLD_EXTRA_BYTES); : REC_N_OLD_EXTRA_BYTES);
/* All data bytes of the record must be valid. */ /* All data bytes of the record must be valid. */
@ -1530,13 +1530,13 @@ 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
: REC_N_OLD_EXTRA_BYTES); : REC_N_OLD_EXTRA_BYTES);
/* All data bytes of the record must be valid. */ /* All data bytes of the record must be valid. */
MEM_CHECK_DEFINED(rec, rec_offs_data_size(offsets)); MEM_CHECK_DEFINED(rec, rec_offs_data_size(offsets));