diff --git a/BUILD/compile-pentium64-valgrind-max b/BUILD/compile-pentium64-valgrind-max
index 0653fb7fe75..84e78805246 100755
--- a/BUILD/compile-pentium64-valgrind-max
+++ b/BUILD/compile-pentium64-valgrind-max
@@ -33,6 +33,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 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"
diff --git a/sql/field.cc b/sql/field.cc
index 89c51288de8..cf4bb4ef4f2 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -7806,7 +7806,7 @@ my_decimal *Field_varstring::val_decimal(my_decimal *decimal_value)
 #ifdef HAVE_valgrind
 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);
 }
 #endif
diff --git a/storage/innobase/include/srv0mon.h b/storage/innobase/include/srv0mon.h
index 58e36676398..934f88ac8ae 100644
--- a/storage/innobase/include/srv0mon.h
+++ b/storage/innobase/include/srv0mon.h
@@ -656,7 +656,7 @@ Use MONITOR_DEC if appropriate mutex protection exists.
 
 #ifdef HAVE_valgrind
 # define MONITOR_CHECK_DEFINED(value) do {	\
-	mon_type_t m = value;			\
+    mon_type_t m __attribute__((unused))= value;        \
 	MEM_CHECK_DEFINED(&m, sizeof m);	\
 } while (0)
 #else /* HAVE_valgrind */
diff --git a/storage/innobase/page/page0cur.cc b/storage/innobase/page/page0cur.cc
index 9bf9fe66b33..14a0ab8aa8a 100644
--- a/storage/innobase/page/page0cur.cc
+++ b/storage/innobase/page/page0cur.cc
@@ -1299,12 +1299,12 @@ page_cur_insert_rec_low(
 
 #ifdef HAVE_valgrind
 	{
-		const void*	rec_start
-			= rec - rec_offs_extra_size(offsets);
-		ulint		extra_size
-			= rec_offs_extra_size(offsets)
-			- (rec_offs_comp(offsets)
-			   ? REC_N_NEW_EXTRA_BYTES
+          const void*   rec_start __attribute__((unused))
+                        = rec - rec_offs_extra_size(offsets);
+                ulint   extra_size __attribute__((unused))
+                        = rec_offs_extra_size(offsets)
+                        - (rec_offs_comp(offsets)
+                           ? REC_N_NEW_EXTRA_BYTES
 			   : REC_N_OLD_EXTRA_BYTES);
 
 		/* All data bytes of the record must be valid. */
@@ -1530,13 +1530,13 @@ page_cur_insert_rec_zip(
 
 #ifdef HAVE_valgrind
 	{
-		const void*	rec_start
-			= rec - rec_offs_extra_size(offsets);
-		ulint		extra_size
-			= rec_offs_extra_size(offsets)
-			- (rec_offs_comp(offsets)
-			   ? REC_N_NEW_EXTRA_BYTES
-			   : REC_N_OLD_EXTRA_BYTES);
+                const void*     rec_start __attribute__((unused))
+                        = rec - rec_offs_extra_size(offsets);
+                ulint           extra_size __attribute__((unused))
+                        = rec_offs_extra_size(offsets)
+                        - (rec_offs_comp(offsets)
+                           ? REC_N_NEW_EXTRA_BYTES
+                           : REC_N_OLD_EXTRA_BYTES);
 
 		/* All data bytes of the record must be valid. */
 		MEM_CHECK_DEFINED(rec, rec_offs_data_size(offsets));