diff options
| author | Monty <monty@mariadb.org> | 2016-06-24 02:25:14 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-06-24 02:25:14 +0300 |
| commit | 4dc50758603d6ed2891412fdb6d37cd8b5541999 (patch) | |
| tree | c31def9d565271ff6ca10ec9c15433a12e91bba6 /storage/xtradb/buf | |
| parent | ec38c7e60bf8dbe54b1551e75254337bec1993a4 (diff) | |
| download | mariadb-git-4dc50758603d6ed2891412fdb6d37cd8b5541999.tar.gz | |
Fixed compiler warnings and test failures found by buildbot
Fixed ccfilter to detect errors where the column is included in the error message
Diffstat (limited to 'storage/xtradb/buf')
| -rw-r--r-- | storage/xtradb/buf/buf0flu.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/xtradb/buf/buf0flu.cc b/storage/xtradb/buf/buf0flu.cc index 5d64b75784a..ec13673a56c 100644 --- a/storage/xtradb/buf/buf0flu.cc +++ b/storage/xtradb/buf/buf0flu.cc @@ -2425,7 +2425,7 @@ ulint af_get_pct_for_dirty() /*==================*/ { - ulint dirty_pct = buf_get_modified_ratio_pct(); + ulint dirty_pct = (ulint) buf_get_modified_ratio_pct(); if (dirty_pct > 0 && srv_max_buf_pool_modified_pct == 0) { return(100); @@ -2445,7 +2445,7 @@ af_get_pct_for_dirty() } } else if (dirty_pct > srv_max_dirty_pages_pct_lwm) { /* We should start flushing pages gradually. */ - return((dirty_pct * 100) + return (ulint) ((dirty_pct * 100) / (srv_max_buf_pool_modified_pct + 1)); } @@ -2463,8 +2463,8 @@ af_get_pct_for_lsn( { lsn_t max_async_age; lsn_t lsn_age_factor; - lsn_t af_lwm = (srv_adaptive_flushing_lwm - * log_get_capacity()) / 100; + lsn_t af_lwm = (lsn_t) ((srv_adaptive_flushing_lwm + * log_get_capacity()) / 100); if (age < af_lwm) { /* No adaptive flushing. */ |