Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team


mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged