into  host.loc:/work/bk/5.1-bugteam


sql/handler.cc:
  Auto merged
mysql-test/r/repair.result:
  Merge with 5.0-bugteam (bug#36055).
mysql-test/t/repair.test:
  Merge with 5.0-bugteam (bug#36055).
sql/sql_table.cc:
  Merge with 5.0-bugteam (bug#36055).