Commit fa0bbff0 authored by Monty's avatar Monty

Fixed that compile-pentium64-valgrind-max works

- 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>
parent d3d2c965
...@@ -33,6 +33,6 @@ path=`dirname $0` ...@@ -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"
...@@ -7806,7 +7806,7 @@ my_decimal *Field_varstring::val_decimal(my_decimal *decimal_value) ...@@ -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
......
...@@ -656,7 +656,7 @@ Use MONITOR_DEC if appropriate mutex protection exists. ...@@ -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 */
......
...@@ -1299,9 +1299,9 @@ page_cur_insert_rec_low( ...@@ -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( ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment