4 files changed, 8 insertions, 11 deletions
diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp
index 8a6bd4997d8..069039ee2f2 100644
--- a/VC++Files/libmysqld/libmysqld.dsp
+++ b/VC++Files/libmysqld/libmysqld.dsp
@@ -87,10 +87,6 @@ LINK32=link.exe
 # Name "libmysqld - Win32 Debug"
 # Begin Source File
 
-SOURCE=..\sql\convert.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\sql\derror.cpp
 # End Source File
 # Begin Source File
@@ -236,10 +232,6 @@ SOURCE=..\sql\mf_iocache.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\sql\mini_client.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\sql\net_serv.cpp
 # End Source File
 # Begin Source File
diff --git a/sql-common/client.c b/sql-common/client.c
index b5f0549279b..81184da0a77 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1023,7 +1023,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
   bzero((char*) field, (uint) sizeof(MYSQL_FIELD)*fields);
 #ifdef MYSQL_SERVER
   unpack_fields_40(data->data, field, alloc, lengths, default_value ? 6 : 5,
-		   default_value, server_capabilities & CLIENT_LONG_FLAG);
+		   default_value, (my_bool)(server_capabilities & CLIENT_LONG_FLAG));
 #else
   if (server_capabilities & CLIENT_PROTOCOL_41)
   {
diff --git a/sql/client_settings.h b/sql/client_settings.h
index bc4cdf2a777..1963281d980 100644
--- a/sql/client_settings.h
+++ b/sql/client_settings.h
@@ -23,11 +23,12 @@ extern char *mysql_unix_port;
                              | CLIENT_LOCAL_FILES | CLIENT_SECURE_CONNECTION)
 
 
-extern ulong slave_net_timeout;
 #define init_sigpipe_variables
 #define set_sigpipe(mysql)
 #define reset_sigpipe(mysql)
 
+extern ulong slave_net_timeout;
+
 #ifdef HAVE_SMEM
 #undef HAVE_SMEM
 #endif
diff --git a/sql/slave.h b/sql/slave.h
index 16ba7f80471..1d00df67b22 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -32,7 +32,7 @@
 
 *****************************************************************************/
 
-extern ulong slave_net_timeout, master_retry_count;
+extern ulong master_retry_count;
 extern MY_BITMAP slave_error_mask;
 extern bool use_slave_mask;
 extern char* slave_load_tmpdir;
@@ -43,6 +43,10 @@ extern my_bool opt_log_slave_updates;
 extern ulonglong relay_log_space_limit;
 struct st_master_info;
 
+extern "C" {
+  extern ulong slave_net_timeout;
+};
+
 /*
   TODO: this needs to be redone, but for now it does not matter since
   we do not have multi-master yet.