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