mysql-test/r/type_newdecimal.result:
  Make test clean up after itself.
mysql-test/t/ps_1general.test:
  Remove improperly merged lines.
mysql-test/t/type_newdecimal.test:
  Make test clean up after itself.