diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-07-17 14:23:44 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-07-17 14:23:44 -0600 |
| commit | 4c26f24575d8c95a39a3f007ef72f6818d8d1439 (patch) | |
| tree | d43d0b0ba4277af15f01d2ff6dfafa1d413c986c /sql | |
| parent | 964e4095874d9fc6bce8c64ff484cbe7deebf125 (diff) | |
| parent | 52d241dec7a8213f73e298b84c606d4afb679564 (diff) | |
| download | mariadb-git-4c26f24575d8c95a39a3f007ef72f6818d8d1439.tar.gz | |
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/slave.cc | 1 | ||||
| -rw-r--r-- | sql/slave.h | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 12fa557635f..422d27ec624 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -262,6 +262,7 @@ ulong keybuff_size,sortbuff_size,max_item_sort_length,table_cache_size, net_interactive_timeout, slow_launch_time = 2L, net_read_timeout,net_write_timeout,slave_open_temp_tables=0, open_files_limit=0, max_binlog_size; +ulong slave_net_timeout; ulong thread_cache_size=0, binlog_cache_size=0, max_binlog_cache_size=0; volatile ulong cached_thread_count=0; @@ -2740,6 +2741,8 @@ CHANGEABLE_VAR changeable_vars[] = { 0, MALLOC_OVERHEAD, (long) ~0, MALLOC_OVERHEAD, IO_SIZE }, { "record_buffer", (long*) &my_default_record_cache_size, 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD, IO_SIZE }, + { "slave_net_timeout", (long*) &slave_net_timeout, + SLAVE_NET_TIMEOUT, 1, 65535, 0, 1 }, { "slow_launch_time", (long*) &slow_launch_time, 2L, 0L, ~0L, 0, 1 }, { "sort_buffer", (long*) &sortbuff_size, @@ -2856,6 +2859,7 @@ struct show_var_st init_vars[]= { {"query_buffer_size", (char*) &query_buff_size, SHOW_LONG}, {"safe_show_database", (char*) &opt_safe_show_db, SHOW_BOOL}, {"server_id", (char*) &server_id, SHOW_LONG}, + {"slave_net_timeout", (char*) &slave_net_timeout, SHOW_LONG}, {"skip_locking", (char*) &my_disable_locking, SHOW_MY_BOOL}, {"skip_networking", (char*) &opt_disable_networking, SHOW_BOOL}, {"skip_show_database", (char*) &opt_skip_show_db, SHOW_BOOL}, diff --git a/sql/slave.cc b/sql/slave.cc index 17420b8fde9..ab1a880a46e 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -678,6 +678,7 @@ static int init_slave_thread(THD* thd) thd->system_thread = thd->bootstrap = 1; thd->client_capabilities = 0; my_net_init(&thd->net, 0); + thd->net.timeout = slave_net_timeout; thd->max_packet_length=thd->net.max_packet; thd->master_access= ~0; thd->priv_user = 0; diff --git a/sql/slave.h b/sql/slave.h index 1f3955d8a09..1932bcb04fe 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -1,6 +1,10 @@ #ifndef SLAVE_H #define SLAVE_H +#define SLAVE_NET_TIMEOUT 3600 + +extern ulong slave_net_timeout; + typedef struct st_master_info { char log_file_name[FN_REFLEN]; |