bk commit into 3.23 tree

[sasha]

Below is the list of changes that have just been commited into a local
3.23. repository of sasha. When sasha does a push, they will be
propogaged to the main repository and within 24 hours after the push into
the public repository. For information on how to access
the public repository see
http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-07-17 14:22:52-06:00, sasha@stripped
  added slave_net_timeout

  sql/mysqld.cc
    1.190 01/07/17 14:22:39 sasha@stripped +4 -0
    slave_net_timeout

  sql/slave.cc
    1.109 01/07/17 14:22:39 sasha@stripped +1 -0
    slave_net_timeout

  sql/slave.h
    1.17 01/07/17 14:22:39 sasha@stripped +4 -0
    slave_net_timeout

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql

--- 1.189/sql/mysqld.cc	Wed Jul 11 19:29:14 2001
+++ 1.190/sql/mysqld.cc	Tue Jul 17 14:22:39 2001
@@ -262,6 +262,7 @@
       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 @@
       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 @@
   {"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},

--- 1.108/sql/slave.cc	Wed Jul 11 21:33:18 2001
+++ 1.109/sql/slave.cc	Tue Jul 17 14:22:39 2001
@@ -678,6 +678,7 @@
   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;

--- 1.16/sql/slave.h	Sat Jul  7 14:17:13 2001
+++ 1.17/sql/slave.h	Tue Jul 17 14:22:39 2001
@@ -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];