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

BUILD/Makefile.am

@@ -54,7 +54,6 @@ EXTRA_DIST =		FINISH.sh \
 			compile-pentium-icc-yassl \
 			compile-pentium-max \
 			compile-pentium-myodbc \
-			compile-pentium-mysqlfs-debug \
 			compile-pentium-pgcc \
 			compile-pentium-valgrind-max \
 			compile-pentium64 \

config/ac-macros/zlib.m4

@@ -20,6 +20,10 @@ save_CPPFLAGS="$CPPFLAGS"
 save_LIBS="$LIBS"
 CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS"
 LIBS="$LIBS $ZLIB_LIBS"
+case "$with_mysqld_ldflags " in
+  *"-all-static "*)
+  CPPFLAGS="$CPPFLAGS -static"  
+esac
 if test X"$with_server" = Xno
 then
   zlibsym=zlibVersion

libmysqld/CMakeLists.txt

@@ -153,6 +153,12 @@ ADD_LIBRARY(mysqlserver STATIC ${LIBMYSQLD_SOURCES})
 ADD_DEPENDENCIES(mysqlserver GenServerSource GenError)
 TARGET_LINK_LIBRARIES(mysqlserver psapi.lib)
 
+IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+  # Workaround cmake bug http://www.vtk.org/Bug/view.php?id=11240
+  SET_TARGET_PROPERTIES(mysqlserver PROPERTIES STATIC_LIBRARY_FLAGS
+    "/MACHINE:AMD64")
+ENDIF()
+
 # Add any additional libraries requested by engine(s)
 FOREACH (ENGINE_LIB ${MYSQLD_STATIC_ENGINE_LIBS})
   STRING(TOUPPER ${ENGINE_LIB} ENGINE_LIB_UPPER)

mysql-test/suite/pbxt/r/key_cache.result

@@ -315,8 +315,7 @@ test.t1	check	status	OK
 DROP TABLE t1,t2;
 set global key_cache_block_size= @my_key_cache_block_size;
 set @@global.key_buffer_size=0;
-Warnings:
-Warning	1438	Cannot drop default keycache
+ERROR HY000: Cannot drop default keycache
 select @@global.key_buffer_size;
 @@global.key_buffer_size
 1048576

mysql-test/suite/pbxt/t/key_cache.test

@@ -220,6 +220,7 @@ set global key_cache_block_size= @my_key_cache_block_size;
 # Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
 # (One cannot drop the default key cache.)
 #
+--error ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
 set @@global.key_buffer_size=0;
 select @@global.key_buffer_size;
 

sql/CMakeLists.txt

@@ -141,7 +141,7 @@ ADD_CUSTOM_TARGET(
                 ${PROJECT_SOURCE_DIR}/sql/message.rc
                 ${PROJECT_SOURCE_DIR}/sql/lex_hash.h)
 
-ADD_DEPENDENCIES(mysqld GenServerSource)
+ADD_DEPENDENCIES(sql GenServerSource)
 
 # Remove the auto-generated files as part of 'Clean Solution'
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES 

storage/federatedx/Makefile.am

@@ -21,23 +21,19 @@ EXTRA_LTLIBRARIES =	libfederatedx.la libfederatedx_common.la libfederatedx_embed
 pkgplugin_LTLIBRARIES =	@plugin_federatedx_shared_target@
 ha_federatedx_la_LDFLAGS =	-module -rpath $(pkgplugindir)
 ha_federatedx_la_CXXFLAGS=	-shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_federatedx_la_CFLAGS =	-shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 
 
 noinst_LTLIBRARIES =	@plugin_federatedx_static_target@ @plugin_federatedx_embedded_static_target@
 libfederatedx_common_la_CXXFLAGS =	$(AM_CXXFLAGS)
-libfederatedx_common_la_CFLAGS =	$(AM_CFLAGS)
 libfederatedx_common_la_SOURCES=	federatedx_txn.cc \
 			        federatedx_io.cc federatedx_io_null.cc \
 			        federatedx_io_mysql.cc
 
-libfederatedx_la_CXXFLAGS =	$(AM_CFLAGS)
-libfederatedx_la_CFLAGS =	$(AM_CFLAGS)
+libfederatedx_la_CXXFLAGS =	$(AM_CXXFLAGS)
 libfederatedx_la_LIBADD =	libfederatedx_common.la
 libfederatedx_la_SOURCES=	ha_federatedx.cc
 
-libfederatedx_embedded_la_CXXFLAGS =	$(AM_CFLAGS) @plugin_embedded_defs@
-libfederatedx_embedded_la_CFLAGS =	$(AM_CFLAGS) @plugin_embedded_defs@
+libfederatedx_embedded_la_CXXFLAGS =	$(AM_CXXCFLAGS) @plugin_embedded_defs@
 libfederatedx_embedded_la_LDFLAGS =	$(AM_LDFLAGS)
 libfederatedx_embedded_la_LIBADD =	libfederatedx_common.la
 libfederatedx_embedded_la_SOURCES=	ha_federatedx.cc

storage/pbxt/src/lock_xt.cc

@@ -2058,11 +2058,12 @@ static void lck_free_thread_data(XTThreadPtr XT_UNUSED(self), void *XT_UNUSED(da
 
 static void lck_do_job(XTThreadPtr self, int job, XSLockTestPtr data, xtBool reader)
 {
-	char b1[2048], b2[2048];
+	char b1[1024], b2[1024];
 
 	switch (job) {
 		case JOB_MEMCPY:
-			memcpy(b1, b2, 2048);
+                        memset(b1, 0, sizeof(b1));
+                        memset(b2, 1, sizeof(b2));
 			data->xs_inc++;
 			break;
 		case JOB_SLEEP:

storage/xtradb/buf/buf0buf.c

@@ -1076,8 +1076,9 @@ buf_chunk_init(
 			"InnoDB: Logical offset (blocks)         : %ld (%#lx)\n",
 				(byte*)chunk->mem + shm_info->frame_offset,
 				chunk->blocks[0].frame, frame,
-				phys_offset, phys_offset, logi_offset, logi_offset,
-				blocks_offset, blocks_offset);
+				phys_offset, phys_offset,
+                                (long) logi_offset, (long) logi_offset,
+				(long) blocks_offset, (long) blocks_offset);
 		} else {
 			fprintf(stderr,
 			"InnoDB: Buffer pool in the shared memory segment can be used as it is.\n");

storage/xtradb/srv/srv0srv.c

@@ -3083,8 +3083,8 @@ srv_master_thread(
 					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);
 				}