into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081


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