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

MDEV-20377: Fix -Wunused-but-set-variable

Browse Source
This commit is contained in:
Marko Mäkelä 2020-07-01 20:34:06 +03:00
parent be51738465
commit 69df4f834b
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
storage/innobase/data/data0data.cc
View File

@ -194,29 +194,20 @@ dtuple_validate(
/*============*/ /*============*/
const dtuple_t* tuple) /*!< in: tuple */ const dtuple_t* tuple) /*!< in: tuple */
{ {
const dfield_t* field;
ulint n_fields;
ulint len;
ulint i;
ut_ad(tuple->magic_n == DATA_TUPLE_MAGIC_N); ut_ad(tuple->magic_n == DATA_TUPLE_MAGIC_N);
#ifdef HAVE_valgrind_or_MSAN
const ulint n_fields = dtuple_get_n_fields(tuple);
n_fields = dtuple_get_n_fields(tuple); for (ulint i = 0; i < n_fields; i++) {
const dfield_t* field = dtuple_get_nth_field(tuple, i);
/* We dereference all the data of each field to test
for memory traps */
for (i = 0; i < n_fields; i++) {
field = dtuple_get_nth_field(tuple, i);
len = dfield_get_len(field);
if (!dfield_is_null(field)) { if (!dfield_is_null(field)) {
MEM_CHECK_DEFINED(dfield_get_data(field), len); MEM_CHECK_DEFINED(dfield_get_data(field),
dfield_get_len(field));
} }
} }
#endif /* HAVE_valgrind_or_MSAN */
ut_a(dtuple_check_typed(tuple)); ut_ad(dtuple_check_typed(tuple));
return(TRUE); return(TRUE);
} }