into  mysql.com:/home/gluh/MySQL/Merge/5.1


sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged