into deer.(none):/home/hf/work/mysql-4.1.clean


sql/item.cc:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged