bzr commit into mysql-6.0-backup branch (horst:2749) Bug#37702

[Horst Hunger]

#At file:///work/bzr/mysql-6.0-37702/

 2749 Horst Hunger	2008-11-26
      fix for bug#37702 version 6.0: timestamp merge is done and timestamp has to be enabled.
modified:
  mysql-test/t/disabled.def

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2008-11-26 06:22:31 +0000
+++ b/mysql-test/t/disabled.def	2008-11-26 09:12:12 +0000
@@ -17,7 +17,6 @@ ctype_create         : Bug#32965 main.ct
 backup_no_engine     : Bug#36021 2008-04-13 rsomla server crashes when openning table with unknown storage engine
 query_cache_wlock_invalidate_func: Bug#35390 causes not deterministic results.
 cast                 : Bug#35594 2008-03-27 main.cast fails on Windows2003-64
-timestamp_func              : Bug #37702 timestamp_func relies on sleep and is unstable in pushbuild
 backup_triggers_and_events  : Bug#37762 2008-07-01 rafal Test fails on remove_file for unknown reasons
 backup_no_be                : Bug#38023 2008-07-16 rafal Test triggers valgrind warnings described in the bug
 thread_cache_size_func      : Bug#40575 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads