into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


sql/mysql_priv.h:
  Auto merged