into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/mysql_priv.h:
  Auto merged
sql/item.cc:
  SCCS merged