Commit 46047734 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

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

into sinisa.nasamreza.org:/mnt/work/mysql
parents 4af87f6c 8f7c6fcc

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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");