into mysql.com:/home/mysql_src/mysql-5.0-clean


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