into mysql.com:/home/pem/work/mysql-5.0


mysql-test/r/show_check.result:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged