into  shellback.(none):/home/msvensson/mysql/my51-bug30843


mysql-test/r/archive.result:
  Merge 5.0->5.1
mysql-test/t/archive.test:
  Merge 5.0->5.1