diff options
| author | unknown <monty@work.mysql.com> | 2001-10-03 18:00:38 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-10-03 18:00:38 +0200 |
| commit | 83fa1116792e55ddb9dc57276b689a97e6ab8f74 (patch) | |
| tree | 7ab8c94ae6dc6e53d241dd2b3e1d38454567ac42 /sql/slave.h | |
| parent | 2e0dc69895280f3b407e56dace32ad9cf25ce356 (diff) | |
| parent | e9a620e60b76b5e3bc162fda893d1798eff20041 (diff) | |
| download | mariadb-git-83fa1116792e55ddb9dc57276b689a97e6ab8f74.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
sql/mysqld.cc:
merge
Don't give an error even if one uses master-ssl options and SSL is
not used.
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h index 5850b57d3b3..5c6772147b6 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -4,7 +4,7 @@ #include "mysql.h" #define SLAVE_NET_TIMEOUT 3600 -extern ulong slave_net_timeout; +extern ulong slave_net_timeout, master_retry_count; extern char* slave_load_tmpdir; typedef struct st_master_info |