diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-07-17 16:23:36 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-07-17 16:23:36 -0600 |
| commit | bab169b6923870bf2e08a80aa8e22d8851a9a10f (patch) | |
| tree | 6b12d97d09cd80fd52fbc48fbe802efa550e1112 /sql/slave.h | |
| parent | 90acfb9ff36c796650b40c8b85f2f4042c60d1fc (diff) | |
| parent | 4c26f24575d8c95a39a3f007ef72f6818d8d1439 (diff) | |
| download | mariadb-git-bab169b6923870bf2e08a80aa8e22d8851a9a10f.tar.gz | |
merged with 3.23
configure.in:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Docs/manual.texi:
merged
mysql-test/t/rpl_sporadic_master.test:
merged
sql/Makefile.am:
merged
sql/slave.h:
merged
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/slave.h b/sql/slave.h index 8e49511e08d..85db0b75f53 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -2,6 +2,10 @@ #define SLAVE_H #include "mysql.h" +#define SLAVE_NET_TIMEOUT 3600 + +extern ulong slave_net_timeout; + typedef struct st_master_info { |