mysql-test/r/partition_not_windows.result:
  Post-merge fixes
  New warnings
mysql-test/r/symlink.result:
  Post-merge fixes
  Typo
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Post-merge fixes
  Defeated creation of a warnings file.
mysql-test/t/partition_symlink.test:
  Post-merge fixes
  Fixed directory to an allowed one.
mysql-test/t/type_set.test:
  Post-merge fixes
  Defeated creation of a warnings file.