mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-11454 post-merge fix:

Browse source 
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.
This commit is contained in:
Marko Mäkelä 2017-02-24 22:08:09 +02:00
parent 342b48b7b1
commit 51af19851a
3 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/sys_vars/disabled.def
View file

@ -12,3 +12,4 @@
innodb_flush_checkpoint_debug_basic: removed from XtraDB-26.0
all_vars: obsolete, see sysvars_* tests
innodb_buffer_pool_dump_pct_function: MDEV-11454 follow-up needed (unstable)

9
storage/innobase/buf/buf0dump.cc
View file

@ -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;
}

17
storage/xtradb/buf/buf0dump.cc
View file

@ -156,7 +156,8 @@ buf_load_status(
fmt, ap);
if (severity == STATUS_NOTICE || severity == STATUS_ERR) {
ib_logf((ib_log_level_t) severity, "%s",
ut_print_timestamp(stderr);
fprintf(stderr, " InnoDB: %s\n",
export_vars.innodb_buffer_pool_load_status);
}
@ -248,21 +249,9 @@ buf_dump(
}
if (srv_buf_pool_dump_pct != 100) {
ulint t_pages;
ut_ad(srv_buf_pool_dump_pct < 100);
/* limit the number of total pages dumped to X% of the
* total number of pages */
t_pages = buf_pool->curr_size
* 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);
n_pages = t_pages;
}
n_pages = n_pages * srv_buf_pool_dump_pct / 100;
if (n_pages == 0) {
n_pages = 1;