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.

mysql-test/suite/sys_vars/disabled.def

@@ -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)

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

storage/xtradb/buf/buf0dump.cc

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