mysql-test/r/partition_not_windows.result:
  fix results from merge
mysql-test/t/disabled.def:
  disable test partition_symlink