bk commit into 5.1 tree (thek:1.2521)

[kpettersson]

Below is the list of changes that have just been committed into a local
5.1 repository of thek. When thek does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-29 13:37:38+02:00, thek@adventure.(none) +2 -0
  Removed broken test from list of test to execute.
  To be restored when PB is patched to ignore 
  requested safemalloc memory dumps.

  mysql-test/t/disabled.def@stripped, 2007-05-29 13:37:35+02:00, thek@adventure.(none) +0 -2
    Restored disabled test file.

  tests/mysql_client_test.c@stripped, 2007-05-29 13:37:35+02:00, thek@adventure.(none) +3 -2
    Removed broken test from list of test to execute.
    To be restored when PB is patched to ignore 
    requested safemalloc memory dumps.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	thek
# Host:	adventure.(none)
# Root:	/home/thek/Development/cpp/mysql-5.1-runtime

--- 1.255/mysql-test/t/disabled.def	2007-05-28 16:47:41 +02:00
+++ 1.256/mysql-test/t/disabled.def	2007-05-29 13:37:35 +02:00
@@ -41,5 +41,3 @@ rpl_row_blob_innodb      : BUG#18980 200
 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!
-

--- 1.239/tests/mysql_client_test.c	2007-05-24 22:13:47 +02:00
+++ 1.240/tests/mysql_client_test.c	2007-05-29 13:37:35 +02:00
@@ -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 }
 };