into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27937


mysql-test/r/ps.result:
  Manual merge
mysql-test/t/ps.test:
  Manual merge
sql/sql_union.cc:
  Manual merge