From 1c23091c4ecc23100a6fe42288819cf4d5dc0b5b Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Wed, 23 Feb 2011 11:22:56 +0200 Subject: Fixed build failures - Removed references to deleted files - If we link staticly, check for static zlib - This should fix the problem with 'no -lz found' link error - Fixed build failure on window (Patch from Wlad) - Fixed build problem with federatedx when using -Werror BUILD/Makefile.am: Remove removed file config/ac-macros/zlib.m4: If we compile with --all-static, test that we have a static libz libmysqld/CMakeLists.txt: Fix for build error on windows mysql-test/suite/pbxt/r/key_cache.result: Updated result mysql-test/suite/pbxt/t/key_cache.test: Fixed not updated test case sql/CMakeLists.txt: Fix for build error on windows storage/federatedx/Makefile.am: Don't use CFLAGS to compile C++ programs storage/pbxt/src/lock_xt.cc: Fixed compiler warning about using uninitialized b2 storage/xtradb/buf/buf0buf.c: Fixed wrong printf storage/xtradb/srv/srv0srv.c: Fixed assignment of different width and test with different sign/unsigned --- storage/xtradb/srv/srv0srv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'storage/xtradb/srv') diff --git a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c index 9602a958faf..3cfdae6f70d 100644 --- a/storage/xtradb/srv/srv0srv.c +++ b/storage/xtradb/srv/srv0srv.c @@ -3083,8 +3083,8 @@ retry_flush_batch: blocks_sum += blocks_num; } - n_flush = blocks_sum * (lsn - lsn_old) / log_sys->max_modified_age_async; - if (flushed_blocks_sum > n_pages_flushed_prev) { + n_flush = (lint) (blocks_sum * (lsn - lsn_old) / log_sys->max_modified_age_async); + if ((ulint) flushed_blocks_sum > n_pages_flushed_prev) { n_flush -= (flushed_blocks_sum - n_pages_flushed_prev); } -- cgit v1.2.1