into mysql.com:/home/pem/work/mysql-5.0-merge


sql/sql_parse.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged