into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum


extra/Makefile.am:
  Auto merged
sql/share/errmsg.txt:
  Use local errmsg.txt
extra/comp_err.c:
  Manual merge