BUILD/SETUP.sh:
  postmerge changes
configure.in:
  postmerge changes
mysql-test/r/ps_maria.result:
  changed result according last MyISAM test changes