diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-01 17:27:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-01 17:27:34 +0300 |
| commit | 1d0f70c2f894b27e98773a282871d32802f67964 (patch) | |
| tree | 833e683e0ced29c4323c29a9d845703d4dfcd81b /include/my_valgrind.h | |
| parent | 5a86a61219826aadf8d08cbc447fe438f2bf50c3 (diff) | |
| download | mariadb-git-1d0f70c2f894b27e98773a282871d32802f67964.tar.gz | |
Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6
Diffstat (limited to 'include/my_valgrind.h')
| -rw-r--r-- | include/my_valgrind.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_valgrind.h b/include/my_valgrind.h index 31651f6c3ed..0aeaef68b50 100644 --- a/include/my_valgrind.h +++ b/include/my_valgrind.h @@ -37,9 +37,9 @@ #endif /* HAVE_VALGRIND */ #ifndef DBUG_OFF -#define TRASH_FILL(A,B,C) do { bfill(A, B, C); MEM_UNDEFINED(A, B); } while (0) +#define TRASH_FILL(A,B,C) do { const size_t trash_tmp= (B) ; bfill(A, trash_tmp, C); MEM_UNDEFINED(A, trash_tmp); } while (0) #else -#define TRASH_FILL(A,B,C) do{ MEM_CHECK_ADDRESSABLE(A,B);MEM_UNDEFINED(A,B);} while (0) +#define TRASH_FILL(A,B,C) do{ const size_t trash_tmp= (B) ; MEM_CHECK_ADDRESSABLE(A,trash_tmp);MEM_UNDEFINED(A,trash_tmp);} while (0) #endif #define TRASH_ALLOC(A,B) TRASH_FILL(A,B,0xA5) #define TRASH_FREE(A,B) TRASH_FILL(A,B,0x8F) |