From 51af19851ab926e44831c7dc2cd83c5e329eabc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 24 Feb 2017 22:08:09 +0200 Subject: MDEV-11454 post-merge fix: buf_dump(): Correct the printf format passed to buf_dump_status() to match the argument types. Revert the changes to storage/xtradb. XtraDB is not being compiled for 10.2. The unused copy that we have in the 10.2 branch is only getting merges from 10.1. Disable the test sys_vars.innodb_buffer_pool_dump_pct_function because it is unstable on buildbot. --- storage/innobase/buf/buf0dump.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'storage/innobase/buf') diff --git a/storage/innobase/buf/buf0dump.cc b/storage/innobase/buf/buf0dump.cc index 9110345fa24..873f4ea438a 100644 --- a/storage/innobase/buf/buf0dump.cc +++ b/storage/innobase/buf/buf0dump.cc @@ -324,9 +324,12 @@ buf_dump( * srv_buf_pool_dump_pct / 100; if (n_pages > t_pages) { buf_dump_status(STATUS_INFO, - "Instance %d, restricted to %u pages " \ - "due to innodb_buf_pool_dump_pct (%d)", - i, t_pages, srv_buf_pool_dump_pct); + "Instance " ULINTPF + ", restricted to " ULINTPF + " pages due to " + "innodb_buf_pool_dump_pct=%lu", + i, t_pages, + srv_buf_pool_dump_pct); n_pages = t_pages; } -- cgit v1.2.1