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 | ed6ab7510a864d4be442cfdd56c886beaf1f248c (patch) | |
| tree | 4b15859b2c597539441bbc27b47283f3485854a7 /sql/slave.h | |
| parent | 0c55e8f6276e3cfa6baa9a1a18038d563a8d72e0 (diff) | |
| download | mariadb-git-ed6ab7510a864d4be442cfdd56c886beaf1f248c.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/slave.h')
| -rw-r--r-- | sql/slave.h | 6 |
1 files changed, 5 insertions, 1 deletions
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. |