into work.mysql.com:/home/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
sql/sql_parse.cc:
  Auto merged