bzr push into mysql-6.0 branch (hezx:2687 to 2688)

[He Zhenxing]

 2688 He Zhenxing	2008-08-15
      enable rpl_row_basic_2myisam/3innodb test
modified:
  mysql-test/suite/rpl/t/disabled.def

 2687 He Zhenxing	2008-08-14
      post fix after merge
modified:
  tests/mysql_client_test.c

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2008-07-25 15:10:14 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2008-08-15 02:14:54 +0000
@@ -29,8 +29,6 @@ rpl_log_pos                : Bug#8693 Te
 rpl_row_basic_7ndb         : BUG#33360 2007-12-19 mats rpl_ndb_idempotent fails due to
null field for table on slave side
 rpl_redirect               : Failure is sporadic and and the test is superfluous (mats)
 rpl_innodb_bug28430        : Failure on Solaris Bug #36793
-rpl_row_basic_2myisam      : Bug#37879 2008-07-14 alik Disabled to make 6.0 greaner (the
test fails too often)
-rpl_row_basic_3innodb      : Bug#37879 2008-07-14 alik Disabled to make 6.0 greaner (the
test fails too often)
 rpl_heartbeat              : Bug#37714 2008-07-14 alik Disabled to make 6.0 greaner (the
test fails too often)
 rpl_idempotency            : Bug#37767 2008-07-14 alik Disabled to make 6.0 greaner (the
test fails too often)