From ac9de478db64c7c4a0b28e8d6aba295531f6e709 Mon Sep 17 00:00:00 2001 From: "sasha@mysql.sashanet.com" <> Date: Tue, 15 Aug 2000 17:49:07 -0600 Subject: [PATCH] fix for the fatal bug in LOAD TABLE FROM MASTER --- sql/slave.cc | 2 +- sql/sql_parse.cc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/slave.cc b/sql/slave.cc index 86abf3e3e1f..afb14dd11c2 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -169,7 +169,7 @@ static int create_table_from_dump(THD* thd, NET* net, const char* db, tables.name = tables.real_name = (char*)table_name; tables.lock_type = TL_WRITE; thd->proc_info = "Opening master dump table"; - if(open_ltable(thd, &tables) || !tables.table) + if(!open_ltable(thd, &tables, TL_WRITE)) { // open tables will send the error sql_print_error("create_table_from_dump: could not open created table"); diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index b176d7516fc..3d903acbfbf 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -248,7 +248,6 @@ check_connections(THD *thd) int2store(end+3,thd->server_status); bzero(end+5,13); end+=18; - net->timeout = net_read_timeout; if (net_write_command(net,protocol_version, buff, (uint) (end-buff)) || (pkt_len=my_net_read(net)) == packet_error ||