From c57d66c58738e29ff35da126ffd4ae8a1553cf17 Mon Sep 17 00:00:00 2001
From: "Sinisa@sinisa.nasamreza.org" <>
Date: Tue, 16 Jul 2002 21:16:34 +0300
Subject: [PATCH] Fixing slave timeouting

---
 Docs/manual.texi | 2 ++
 sql/slave.cc     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Docs/manual.texi b/Docs/manual.texi
index 1ef91638e17..e005cedf144 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -46928,6 +46928,8 @@ not yet 100% confident in this code.
 @appendixsubsec Changes in release 3.23.52
 @itemize @bullet
 @item
+Fixed bug with slave net read timeouting
+@item
 Fixed bug in ALTERing  TABLE of BDB type.
 @item
 Fixed bug when logging @code{LOAD DATA INFILE} to binary log with no 
diff --git a/sql/slave.cc b/sql/slave.cc
index 32c478c369d..c3365952d5f 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -456,7 +456,7 @@ int fetch_nx_table(THD* thd, MASTER_INFO* mi)
     nx_errno = ER_BAD_HOST_ERROR;
     goto err;
   }
-
+  mysql->net.timeout=slave_net_timeout;
   safe_connect(thd, mysql, mi);
   if (slave_killed(thd))
     goto err;
@@ -1297,6 +1297,7 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
     goto err;
   }
   
+  mysql->net = thd->net;
   thd->proc_info = "connecting to master";
 #ifndef DBUG_OFF  
   sql_print_error("Slave thread initialized");