bzr push into mysql-6.0 branch (davi:2681 to 2682) Bug#37481

[Davi Arnaut]

 2682 Davi Arnaut	2008-06-25
      Disable main.status test case due to Bug#37481
modified:
  mysql-test/t/disabled.def

 2681 Gleb Shchepa	2008-06-25 [merge]
      auto merge 5.1-bugteam --> 6.0-bugteam

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2008-06-02 15:47:07 +0000
+++ b/mysql-test/t/disabled.def	2008-06-25 14:46:32 +0000
@@ -31,6 +31,7 @@ thread_cache_size_func: BUG#35988, BUG#3
 cast                 : Bug#35594 2008-03-27 main.cast fails on Windows2003-64
 subselect_notembedded  : Bug#35803, Bug#33506 2008-Apr-03 subselect_notembedded crashes
the server
 user_limits     : Bug#23921 random failure of user_limits.test
+status          : Bug#37481 status.test fails randomly
 key_buffer_size_basic_64    : Bug #36522: Some tests of system variables have diffs on
64bit platorms
 rpl_recovery_rank_basic_64  : Bug #36522: Some tests of system variables have diffs on
64bit platorms
 sort_buffer_size_basic_64   : Bug #36522: Some tests of system variables have diffs on
64bit platorms