diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-01-29 14:33:53 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-01-29 14:33:53 +0100 |
| commit | 7620e066dbf16f170ce1a5baa516eb7c560c9a51 (patch) | |
| tree | 5ff0b0c41c572069a02dbb2c6eabec3d10d8900d /sql/slave.cc | |
| parent | 39fb7b2423c01b168ca4947307426edb945abfe2 (diff) | |
| parent | a195ad5ea26227dac0d5f503b9e37717b2bc40be (diff) | |
| download | mariadb-git-7620e066dbf16f170ce1a5baa516eb7c560c9a51.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943
into pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viossl.c:
Auto merged
sql/mysql_priv.h:
Manual merge
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 8805f950d50..b77d154a08f 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2901,7 +2901,6 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type) */ thd->variables.max_allowed_packet= global_system_variables.max_allowed_packet + MAX_LOG_EVENT_HEADER; /* note, incr over the global not session var */ - thd->net.read_timeout = slave_net_timeout; thd->slave_thread = 1; set_slave_thread_options(thd); thd->client_capabilities = CLIENT_LOCAL_FILES; |