into  mysql.com:/home/bar/mysql-5.1.b25081


mysql-test/r/show_check.result:
  Auto merged
sql/sql_show.cc:
  Auto merged