Build-tools/Do-compile:
  Auto merged
client/mysqldump.c:
  Aborted Serges patch as this would have caused incompatibility
  problems with old MySQL servers.