into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860


BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
  Delete: BitKeeper/etc/collapsed
BitKeeper/etc/collapsed:
  'Auto converge'
sql/mysqld.cc:
  manual merge