diff options
| -rw-r--r-- | extra/jemalloc/src/ctl.c | 2 | ||||
| -rw-r--r-- | include/mysql/service_logger.h | 2 | ||||
| -rw-r--r-- | storage/maria/ma_check.c | 2 | ||||
| -rw-r--r-- | support-files/compiler_warnings.supp | 5 | ||||
| -rw-r--r-- | tests/bug25714.c | 2 |
5 files changed, 10 insertions, 3 deletions
diff --git a/extra/jemalloc/src/ctl.c b/extra/jemalloc/src/ctl.c index f2ef4e60611..7ce4fc4d573 100644 --- a/extra/jemalloc/src/ctl.c +++ b/extra/jemalloc/src/ctl.c @@ -1109,7 +1109,7 @@ epoch_ctl(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp, void *newp, size_t newlen) { int ret; - uint64_t newval; + uint64_t newval __attribute__((unused)); malloc_mutex_lock(&ctl_mtx); WRITE(newval, uint64_t); diff --git a/include/mysql/service_logger.h b/include/mysql/service_logger.h index a84c4a4f2ee..962ab2fbc0b 100644 --- a/include/mysql/service_logger.h +++ b/include/mysql/service_logger.h @@ -80,7 +80,7 @@ extern struct logger_service_st { #define logger_rotate(log) (logger_service->rotate(log)) #define logger_vprintf(log, fmt, argptr) (logger_service->\ vprintf(log, fmt, argptr)) -#define logger_printf logger_service->printf +#define logger_printf (*logger_service->printf) #define logger_write(log, buffer, size) \ (logger_service->write(log, buffer, size)) #else diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c index d63ac8be3cb..b7bd08d8bb7 100644 --- a/storage/maria/ma_check.c +++ b/storage/maria/ma_check.c @@ -1862,6 +1862,8 @@ static int check_block_record(HA_CHECK *param, MARIA_HA *info, int extend, uint UNINIT_VAR(row_count), real_row_count, empty_space, page_type, bitmap_pattern; uint bitmap_for_page; + LINT_INIT(empty_space); + if (_ma_killed_ptr(param)) { _ma_scan_end_block_record(info); diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index cd39b3f7a9d..315af529149 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -161,6 +161,11 @@ include/pwdbased\.hpp: comparison of unsigned expression .*auth_pam\.c : initialization from incompatible pointer type : 100-200 # +# jemalloc +# +jemalloc/src/jemalloc\.c: always_inline function might not be inlinable + +# # Unexplanable (?) stuff # listener.cc : .*conversion from 'SOCKET' to 'int'.* diff --git a/tests/bug25714.c b/tests/bug25714.c index 40c631d76a5..7e6be13624b 100644 --- a/tests/bug25714.c +++ b/tests/bug25714.c @@ -23,7 +23,7 @@ int main (int argc, char **argv) { MYSQL conn; - int OK; + int OK __attribute__((unused)); const char* query4= "INSERT INTO federated.t1 SET Value=54"; const char* query5= "INSERT INTO federated.t1 SET Value=55"; |