1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marko Mäkelä 2017-04-21 16:22:46 +03:00
parent 87b6df31c4
commit e48ae21b0e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/innobase/os/os0file.cc
View File

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

4
storage/innobase/srv/srv0srv.cc
View File

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

4
storage/xtradb/os/os0file.cc
View File

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

4
storage/xtradb/srv/srv0srv.cc
View File

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