into deer.(none):/home/hf/work/mysql-4.1.emb


include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged