Follow-up to MDEV-12534: Fix warnings on 32-bit systems

Author: dr-m

storage/innobase/os/os0file.cc

@@ -5647,8 +5647,8 @@ os_aio_print(
 os_n_file_writes,
 os_n_fsyncs);
 
-const ulint n_reads = MONITOR_VALUE(MONITOR_OS_PENDING_READS);
-const ulint n_writes = MONITOR_VALUE(MONITOR_OS_PENDING_WRITES);
+const ulint n_reads = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_READS));
+const ulint n_writes = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_WRITES));
 
 if (n_reads != 0 || n_writes != 0) {
 fprintf(file,

storage/innobase/srv/srv0srv.cc

@@ -1409,10 +1409,10 @@ srv_export_innodb_status(void)
 mutex_enter(&srv_innodb_monitor_mutex);
 
 export_vars.innodb_data_pending_reads =
-MONITOR_VALUE(MONITOR_OS_PENDING_READS);
+ulint(MONITOR_VALUE(MONITOR_OS_PENDING_READS));
 
 export_vars.innodb_data_pending_writes =
-MONITOR_VALUE(MONITOR_OS_PENDING_WRITES);
+ulint(MONITOR_VALUE(MONITOR_OS_PENDING_WRITES));
 
 export_vars.innodb_data_pending_fsyncs =
 fil_n_pending_log_flushes

storage/xtradb/os/os0file.cc

@@ -5820,8 +5820,8 @@ os_aio_print(
 os_n_file_writes,
 os_n_fsyncs);
 
-const ulint n_reads = MONITOR_VALUE(MONITOR_OS_PENDING_READS);
-const ulint n_writes = MONITOR_VALUE(MONITOR_OS_PENDING_WRITES);
+const ulint n_reads = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_READS));
+const ulint n_writes = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_WRITES));
 
 if (n_reads != 0 || n_writes != 0) {
 fprintf(file,

storage/xtradb/srv/srv0srv.cc

@@ -1735,10 +1735,10 @@ srv_export_innodb_status(void)
 mutex_enter(&srv_innodb_monitor_mutex);
 
 export_vars.innodb_data_pending_reads =
-MONITOR_VALUE(MONITOR_OS_PENDING_READS);
+ulint(MONITOR_VALUE(MONITOR_OS_PENDING_READS));
 
 export_vars.innodb_data_pending_writes =
-MONITOR_VALUE(MONITOR_OS_PENDING_WRITES);
+ulint(MONITOR_VALUE(MONITOR_OS_PENDING_WRITES));
 
 export_vars.innodb_data_pending_fsyncs =
 fil_n_pending_log_flushes