after merge clean-up


mysql-test/r/ps_6bdb.result:
  after merge clean-up
mysql-test/r/ps_7ndb.result:
  after merge clean-up