Commit 791b5d98 authored by unknown's avatar unknown

fix for the fatal bug in LOAD TABLE FROM MASTER


sql/slave.cc:
  fixed a bug in LOAD TABLE FROM MASTER - the table was not being locked during repair
sql/sql_parse.cc:
  reverse the bookkeeping so that sql_parse.cc now matches Monty's
parent 51eba25a
......@@ -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");
......
......@@ -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 ||
......
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