fix for the fatal bug in LOAD TABLE FROM MASTER

parent b617e9ba
...@@ -169,7 +169,7 @@ static int create_table_from_dump(THD* thd, NET* net, const char* db, ...@@ -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.name = tables.real_name = (char*)table_name;
tables.lock_type = TL_WRITE; tables.lock_type = TL_WRITE;
thd->proc_info = "Opening master dump table"; 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 // open tables will send the error
sql_print_error("create_table_from_dump: could not open created table"); sql_print_error("create_table_from_dump: could not open created table");
......
...@@ -248,7 +248,6 @@ check_connections(THD *thd) ...@@ -248,7 +248,6 @@ check_connections(THD *thd)
int2store(end+3,thd->server_status); int2store(end+3,thd->server_status);
bzero(end+5,13); bzero(end+5,13);
end+=18; end+=18;
net->timeout = net_read_timeout;
if (net_write_command(net,protocol_version, buff, if (net_write_command(net,protocol_version, buff,
(uint) (end-buff)) || (uint) (end-buff)) ||
(pkt_len=my_net_read(net)) == packet_error || (pkt_len=my_net_read(net)) == packet_error ||
......
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