database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Windows build fixups (Fix for slave_net_timeout)

Browse Source
This commit is contained in:
venu@myvenu.com
2003-06-03 22:57:42 -07:00
parent 45fc8cc25b
commit 99ceb8fd04
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
VC++Files/libmysqld/libmysqld.dsp
View File

@ -87,10 +87,6 @@ LINK32=link.exe
# Name "libmysqld - Win32 Debug" # Name "libmysqld - Win32 Debug"
# Begin Source File # Begin Source File
SOURCE=..\sql\convert.cpp
# End Source File
# Begin Source File
SOURCE=..\sql\derror.cpp SOURCE=..\sql\derror.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -236,10 +232,6 @@ SOURCE=..\sql\mf_iocache.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\sql\mini_client.cpp
# End Source File
# Begin Source File
SOURCE=..\sql\net_serv.cpp SOURCE=..\sql\net_serv.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

2
sql-common/client.c
View File

@ -1023,7 +1023,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
bzero((char*) field, (uint) sizeof(MYSQL_FIELD)*fields); bzero((char*) field, (uint) sizeof(MYSQL_FIELD)*fields);
#ifdef MYSQL_SERVER #ifdef MYSQL_SERVER
unpack_fields_40(data->data, field, alloc, lengths, default_value ? 6 : 5, 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 #else
if (server_capabilities & CLIENT_PROTOCOL_41) if (server_capabilities & CLIENT_PROTOCOL_41)
{ {

3
sql/client_settings.h
View File

@ -23,11 +23,12 @@ extern char *mysql_unix_port;
| CLIENT_LOCAL_FILES | CLIENT_SECURE_CONNECTION) | CLIENT_LOCAL_FILES | CLIENT_SECURE_CONNECTION)
extern ulong slave_net_timeout;
#define init_sigpipe_variables #define init_sigpipe_variables
#define set_sigpipe(mysql) #define set_sigpipe(mysql)
#define reset_sigpipe(mysql) #define reset_sigpipe(mysql)
extern ulong slave_net_timeout;
#ifdef HAVE_SMEM #ifdef HAVE_SMEM
#undef HAVE_SMEM #undef HAVE_SMEM
#endif #endif

6
sql/slave.h
View File

@ -32,7 +32,7 @@
*****************************************************************************/ *****************************************************************************/
extern ulong slave_net_timeout, master_retry_count; extern ulong master_retry_count;
extern MY_BITMAP slave_error_mask; extern MY_BITMAP slave_error_mask;
extern bool use_slave_mask; extern bool use_slave_mask;
extern char* slave_load_tmpdir; extern char* slave_load_tmpdir;
@ -43,6 +43,10 @@ extern my_bool opt_log_slave_updates;
extern ulonglong relay_log_space_limit; extern ulonglong relay_log_space_limit;
struct st_master_info; 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 TODO: this needs to be redone, but for now it does not matter since
we do not have multi-master yet. we do not have multi-master yet.