into  amd64.:D:/src/mysql-5.1-maint_bug23983


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