diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-01-25 10:11:37 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-01-26 08:05:24 +0200 |
| commit | 71495a1748784a887f42888a2a7b8cac5e088ff6 (patch) | |
| tree | e54eaeb99a8a9d0c441037025f53ac1d0b7ae0bb /storage/innobase/sync | |
| parent | 45f451c769668e6a351b0c023a994fdf9c07b1f7 (diff) | |
| download | mariadb-git-71495a1748784a887f42888a2a7b8cac5e088ff6.tar.gz | |
MDEV-11849: Fix storage/innobase/* compile warnings
Diffstat (limited to 'storage/innobase/sync')
| -rw-r--r-- | storage/innobase/sync/sync0arr.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/sync/sync0rw.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/sync/sync0arr.cc b/storage/innobase/sync/sync0arr.cc index f01149f8a8d..c9423a04fba 100644 --- a/storage/innobase/sync/sync0arr.cc +++ b/storage/innobase/sync/sync0arr.cc @@ -1340,7 +1340,7 @@ sync_arr_fill_sys_semphore_waits_table( */ OK(field_store_string(fields[SYS_SEMAPHORE_WAITS_FILE], innobase_basename(cell->file))); OK(field_store_ulint(fields[SYS_SEMAPHORE_WAITS_LINE], cell->line)); - OK(field_store_ulint(fields[SYS_SEMAPHORE_WAITS_WAIT_TIME], (longlong)difftime(time(NULL), cell->reservation_time))); + OK(field_store_ulint(fields[SYS_SEMAPHORE_WAITS_WAIT_TIME], (ulint)difftime(time(NULL), cell->reservation_time))); if (type == SYNC_MUTEX) { mutex = static_cast<WaitMutex*>(cell->latch.mutex); diff --git a/storage/innobase/sync/sync0rw.cc b/storage/innobase/sync/sync0rw.cc index 5f617ae22f5..5cb90ce5b8d 100644 --- a/storage/innobase/sync/sync0rw.cc +++ b/storage/innobase/sync/sync0rw.cc @@ -498,7 +498,7 @@ rw_lock_x_lock_wait_func( rw_lock_stats.rw_x_spin_round_count.add(n_spins); if (count_os_wait > 0) { - lock->count_os_wait += count_os_wait; + lock->count_os_wait += static_cast<uint32_t>(count_os_wait); rw_lock_stats.rw_x_os_wait_count.add(count_os_wait); } |