Merge stella.local:/home2/mydev/mysql-5.1-ateam

into  stella.local:/home2/mydev/mysql-5.1-axmrg

mysql-test/suite/parts/t/disabled.def

@@ -18,3 +18,5 @@ partition_value_ndb            : cannot create t1
 rpl_ndb_dd_partitions          : cannot create t1
 partition_alter4_myisam        : Bug#20129 / WL#4176
 partition_alter4_innodb        : Bug#20129 / WL#4176
+partition_basic_symlink_innodb : Bug#35306 Make pushbuild green
+partition_basic_symlink_myisam : Bug#35306 Make pushbuild green

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    : Bug#35305 Make pushbuild green

mysql-test/t/partition_symlink.test

@@ -125,6 +125,9 @@ connection default;
   DROP USER mysqltest_1@localhost;
   disconnect con1;
 
+#--exec rmdir $MYSQLTEST_VARDIR/tmp/test || true
+#--exec rmdir $MYSQLTEST_VARDIR/tmp/mysqltest2 || true
+
 #
 # Bug #24633 SQL MODE "NO_DIR_IN_CREATE" does not work with partitioned tables 
 #
@@ -171,6 +174,3 @@ create table t1 (a int)
 partition by key (a)
 (partition p0,
  partition p1 DATA DIRECTORY 'part-data' INDEX DIRECTORY 'part-data');
-
-#--exec rmdir $MYSQLTEST_VARDIR/tmp/test || true
-#--exec rmdir $MYSQLTEST_VARDIR/tmp/mysqltest2 || true