into  mysql.com:/home/cps/mysql/devel/5.1-cleanup


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