Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
unknown authored
Docs/manual.texi:
  Auto merged
sql/sql_parse.cc:
  Auto merged
ad4e6865