Merge kaamos.(none):/data/src/opt/mysql-5.0-opt

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


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