Commit e48ae21b authored by Marko Mäkelä's avatar Marko Mäkelä

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

parent 87b6df31
...@@ -5647,8 +5647,8 @@ os_aio_print( ...@@ -5647,8 +5647,8 @@ os_aio_print(
os_n_file_writes, os_n_file_writes,
os_n_fsyncs); os_n_fsyncs);
const ulint n_reads = MONITOR_VALUE(MONITOR_OS_PENDING_READS); const ulint n_reads = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_READS));
const ulint n_writes = MONITOR_VALUE(MONITOR_OS_PENDING_WRITES); const ulint n_writes = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_WRITES));
if (n_reads != 0 || n_writes != 0) { if (n_reads != 0 || n_writes != 0) {
fprintf(file, fprintf(file,
......
...@@ -1409,10 +1409,10 @@ srv_export_innodb_status(void) ...@@ -1409,10 +1409,10 @@ srv_export_innodb_status(void)
mutex_enter(&srv_innodb_monitor_mutex); mutex_enter(&srv_innodb_monitor_mutex);
export_vars.innodb_data_pending_reads = 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 = 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 = export_vars.innodb_data_pending_fsyncs =
fil_n_pending_log_flushes fil_n_pending_log_flushes
......
...@@ -5820,8 +5820,8 @@ os_aio_print( ...@@ -5820,8 +5820,8 @@ os_aio_print(
os_n_file_writes, os_n_file_writes,
os_n_fsyncs); os_n_fsyncs);
const ulint n_reads = MONITOR_VALUE(MONITOR_OS_PENDING_READS); const ulint n_reads = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_READS));
const ulint n_writes = MONITOR_VALUE(MONITOR_OS_PENDING_WRITES); const ulint n_writes = ulint(MONITOR_VALUE(MONITOR_OS_PENDING_WRITES));
if (n_reads != 0 || n_writes != 0) { if (n_reads != 0 || n_writes != 0) {
fprintf(file, fprintf(file,
......
...@@ -1735,10 +1735,10 @@ srv_export_innodb_status(void) ...@@ -1735,10 +1735,10 @@ srv_export_innodb_status(void)
mutex_enter(&srv_innodb_monitor_mutex); mutex_enter(&srv_innodb_monitor_mutex);
export_vars.innodb_data_pending_reads = 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 = 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 = export_vars.innodb_data_pending_fsyncs =
fil_n_pending_log_flushes fil_n_pending_log_flushes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment