Merge sinisa@work.mysql.com:/home/bk/mysql

into sinisa.nasamreza.org:/mnt/work/mysql


sql/slave.cc:
  Auto merged

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 

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;
@@ -1312,6 +1312,7 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
     goto err;
   }
   
+  mysql->net.timeout=slave_net_timeout;
   thd->proc_info = "connecting to master";
 #ifndef DBUG_OFF  
   sql_print_error("Slave thread initialized");