Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime

mysql-test/t/disabled.def

@@ -41,5 +41,3 @@ rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly
 rpl_ndb_stm_innodb       : Bug#26783
 ndb_partition_error2	 : HF is not sure if the test can work as internded on all the platforms
 
-mysql_client_test	 : safemalloc memory dump reported as memory leak although it isn't. Fix PB!
-

tests/mysql_client_test.c

@@ -16077,8 +16077,8 @@ static void test_bug24179()
 
 /*
   Bug#28075 "COM_DEBUG crashes mysqld"
+  Note: Test disabled because of failure in PushBuild.
 */
-
 static void test_bug28075()
 {
   int rc;
@@ -16095,7 +16095,6 @@ static void test_bug28075()
   DBUG_VOID_RETURN;
 }
 
-
 /*
   Read and parse arguments and MySQL options from my.cnf
 */
@@ -16380,7 +16379,9 @@ static struct my_tests_st my_tests[]= {
   { "test_status",   test_status   },
   { "test_bug24179", test_bug24179 },
   { "test_ps_query_cache", test_ps_query_cache },
+#ifdef fix_bug_in_pb_first 
   { "test_bug28075", test_bug28075 },
+#endif
   { 0, 0 }
 };