fix results after merge

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

mysql-test/r/partition_not_windows.result

@@ -23,6 +23,9 @@ partition p01 values less than (1000)
 data directory='/not/existing'
   index directory='/not/existing'
 );
+Warnings:
+Warning	0	DATA DIRECTORY option ignored
+Warning	0	INDEX DIRECTORY option ignored
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (

mysql-test/t/disabled.def

@@ -21,3 +21,4 @@ ctype_create         : Bug#32965 main.ctype_create fails
 status               : Bug#32966 main.status fails
 ps_ddl               : Bug#12093 2007-12-14 pending WL#4165 / WL#4166
 csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables
+partition_symlink    : Make pushbuild green