diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 17:32:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 17:32:23 +0200 |
| commit | 8ee9d19607d84aeebf97b704a19453f6a772299b (patch) | |
| tree | 75e597dde9dc38b7fa3352abec7e88edddce2182 /storage/innobase/buf/buf0lru.cc | |
| parent | 08f3280235efbaf20988b81653fced604de1a90f (diff) | |
| parent | 60aba058b116c1d2fa4106fc8de92daf10152480 (diff) | |
| download | mariadb-git-8ee9d19607d84aeebf97b704a19453f6a772299b.tar.gz | |
innodb 5.6.17
Diffstat (limited to 'storage/innobase/buf/buf0lru.cc')
| -rw-r--r-- | storage/innobase/buf/buf0lru.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/storage/innobase/buf/buf0lru.cc b/storage/innobase/buf/buf0lru.cc index 98d0ec2d2ec..ec30c063a72 100644 --- a/storage/innobase/buf/buf0lru.cc +++ b/storage/innobase/buf/buf0lru.cc @@ -1262,7 +1262,8 @@ loop: memset(&block->page.zip, 0, sizeof block->page.zip); if (started_monitor) { - srv_print_innodb_monitor = mon_value_was; + srv_print_innodb_monitor = + static_cast<my_bool>(mon_value_was); } return(block); @@ -2046,11 +2047,12 @@ func_exit: buf_pool->page_hash, thus inaccessible by any other thread. */ - checksum = page_zip_calc_checksum( - b->zip.data, - page_zip_get_size(&b->zip), - static_cast<srv_checksum_algorithm_t>( - srv_checksum_algorithm)); + checksum = static_cast<ib_uint32_t>( + page_zip_calc_checksum( + b->zip.data, + page_zip_get_size(&b->zip), + static_cast<srv_checksum_algorithm_t>( + srv_checksum_algorithm))); mach_write_to_4(b->zip.data + FIL_PAGE_SPACE_OR_CHKSUM, checksum); |