diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-21 16:22:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-21 16:22:46 +0300 |
| commit | e48ae21b0ea99a3d3cc16eebd414cc484fa4f38a (patch) | |
| tree | 2b1456d361237017c544405a2eafbc645c56285c /storage/xtradb | |
| parent | 87b6df31c4ae97c09dc67e370978112fe39764bb (diff) | |
| download | mariadb-git-e48ae21b0ea99a3d3cc16eebd414cc484fa4f38a.tar.gz | |
Follow-up to MDEV-12534: Fix warnings on 32-bit systems
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/os/os0file.cc | 4 | ||||
| -rw-r--r-- | storage/xtradb/srv/srv0srv.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc index 48ae49f28e4..9632bb77df9 100644 --- a/storage/xtradb/os/os0file.cc +++ b/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, diff --git a/storage/xtradb/srv/srv0srv.cc b/storage/xtradb/srv/srv0srv.cc index c47119e63cf..5b3f86d8641 100644 --- a/storage/xtradb/srv/srv0srv.cc +++ b/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 |