Fixing slave timeouting

parent dfc866b3
...@@ -46928,6 +46928,8 @@ not yet 100% confident in this code. ...@@ -46928,6 +46928,8 @@ not yet 100% confident in this code.
@appendixsubsec Changes in release 3.23.52 @appendixsubsec Changes in release 3.23.52
@itemize @bullet @itemize @bullet
@item @item
Fixed bug with slave net read timeouting
@item
Fixed bug in ALTERing TABLE of BDB type. Fixed bug in ALTERing TABLE of BDB type.
@item @item
Fixed bug when logging @code{LOAD DATA INFILE} to binary log with no Fixed bug when logging @code{LOAD DATA INFILE} to binary log with no
...@@ -456,7 +456,7 @@ int fetch_nx_table(THD* thd, MASTER_INFO* mi) ...@@ -456,7 +456,7 @@ int fetch_nx_table(THD* thd, MASTER_INFO* mi)
nx_errno = ER_BAD_HOST_ERROR; nx_errno = ER_BAD_HOST_ERROR;
goto err; goto err;
} }
mysql->net.timeout=slave_net_timeout;
safe_connect(thd, mysql, mi); safe_connect(thd, mysql, mi);
if (slave_killed(thd)) if (slave_killed(thd))
goto err; goto err;
...@@ -1297,6 +1297,7 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused))) ...@@ -1297,6 +1297,7 @@ pthread_handler_decl(handle_slave,arg __attribute__((unused)))
goto err; goto err;
} }
mysql->net = thd->net;
thd->proc_info = "connecting to master"; thd->proc_info = "connecting to master";
#ifndef DBUG_OFF #ifndef DBUG_OFF
sql_print_error("Slave thread initialized"); sql_print_error("Slave thread initialized");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment