mysql-test/r/ps.result:
  Fix after manual merge: update for different error message.
mysql-test/t/ps.test:
  Fix after manual merge: use right error codes.