Merge deer.(none):/home/hf/work/mysql-4.1.clean

into deer.(none):/home/hf/work/mysql-5.0.clean


libmysqld/libmysqld.c:
  Auto merged