into xiphis.org:/usr/home/antony/work2/p3-bug6877.3


sql/mysql_priv.h:
  Auto merged
sql/table.cc:
  Auto merged