From 6d4cfbbca528ce54b7c8839082f74e4cac69321c Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Mon, 1 Mar 2010 07:30:22 -0700 Subject: [PATCH] Bug#50296 Slave reconnects earlier than the prescribed slave_net_timeout value Fixed failed assert on 64 bit platforms, introduced by the previous fix. mysqld: sys_vars.h:125: Assertion `size == sizeof(T)' failed. --- sql/sys_vars.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 1d3ef17c5a1..b7aa4007153 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2795,7 +2795,7 @@ static bool fix_slave_net_timeout(sys_var *self, THD *thd, enum_var_type type) mysql_mutex_unlock(&LOCK_active_mi); return false; } -static Sys_var_ulong Sys_slave_net_timeout( +static Sys_var_uint Sys_slave_net_timeout( "slave_net_timeout", "Number of seconds to wait for more data " "from a master/slave connection before aborting the read", GLOBAL_VAR(slave_net_timeout), CMD_LINE(REQUIRED_ARG),