mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into sinisa.nasamreza.org:/mnt/work/mysql
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2002-07-16 22:08:41 +03:00
commit 460477344a
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Docs/manual.texi
View file

@ -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

3
sql/slave.cc
View file

@ -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");