into trift-lap.fambruehe:/MySQL/M51/merge-5.1


sql/sp_head.cc:
  Auto merged
sql/table.cc:
  Auto merged