diff options
| author | unknown <venu@myvenu.com> | 2003-06-03 22:57:42 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-06-03 22:57:42 -0700 |
| commit | b7eadb2a098c3734a6715c33f30bdd28e4f049a4 (patch) | |
| tree | 4b15859b2c597539441bbc27b47283f3485854a7 /sql | |
| parent | f403a2967b85c1898e4d7c97c185601cfb2c4a33 (diff) | |
| download | mariadb-git-b7eadb2a098c3734a6715c33f30bdd28e4f049a4.tar.gz | |
Windows build fixups (Fix for slave_net_timeout)
VC++Files/libmysqld/libmysqld.dsp:
Remove the old files from Embedded library
sql/slave.h:
Fix for client.c - slave_net_timeout
sql-common/client.c:
Fix warning
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/client_settings.h | 3 | ||||
| -rw-r--r-- | sql/slave.h | 6 |
2 files changed, 7 insertions, 2 deletions
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. |