bzr commit into mysql-6.0-backup branch (charles.bell:2889) Bug#47698

[Chuck Bell]

#At file:///Users/cbell/source/bzr/mysql-6.0-bug-47698/ based on revid:ritheesh.vedire@stripped

 2889 Chuck Bell	2009-11-10
      BUG#47698: backup.backup_logs fails under valgrind
      
      The backup_logs test contains a test statement designed to ensure 
      backup completes in less than 5 seconds. This goal is arbitrary
      and serves no purpose given the environment these tests execute.
      There could be significant delays in processing for virtual machines
      under heavy load thereby making any execution timing unpredictable.
      
      This patch removes the arbitrary timing test statement.
     @ mysql-test/collections/default.experimental
        Removed test from experimental list.
     @ mysql-test/suite/backup/r/backup_logs.result
        Corrected result file.
     @ mysql-test/suite/backup/t/backup_logs.test
        Removed arbitrary and inaccurate test statement.

    modified:
      mysql-test/collections/default.experimental
      mysql-test/suite/backup/r/backup_logs.result
      mysql-test/suite/backup/t/backup_logs.test
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2009-11-02 14:05:19 +0000
+++ b/mysql-test/collections/default.experimental	2009-11-10 17:24:18 +0000
@@ -4,7 +4,6 @@
 backup.backup_dbname_lctn2  @windows  @darwin   # Bug#46933 2009-08-26 alik backup_*_lctn2 tests fail on windows
 backup.backup_events                     # Bug#47211 2009-09-25 alik backup_events.test fails randomly
 backup.backup_external_non_win*          # BUG#45877
-backup.backup_logs                       # Bug#47698 2009-09-29 alik backup.backup_logs fails under valgrind
 backup.backup_xpfm_compat_backup_lctn2 @windows # Bug#46933 2009-08-26 alik backup_*_lctn2 tests fail on windows
 
 binlog.binlog_multi_engine               # joro : NDB tests marked as experimental as agreed with bochklin

=== modified file 'mysql-test/suite/backup/r/backup_logs.result'
--- a/mysql-test/suite/backup/r/backup_logs.result	2009-11-04 14:18:21 +0000
+++ b/mysql-test/suite/backup/r/backup_logs.result	2009-11-10 17:24:18 +0000
@@ -205,12 +205,6 @@ Turn off debugging session.
 SET SESSION debug="-d";
 SET time_zone='+0:00';
 SELECT now() INTO @stop_backup;
-We calculate the timedifference between backup start time and stop
-time. If this difference is '0', then backup start time and stop time
-are same.
-SELECT timediff(@stop_backup, @start_backup) > 5;
-timediff(@stop_backup, @start_backup) > 5
-0
 
 Now verify actual start time / stop time of backup and start time /
 stop time from backup_history table. If the both times are same, 

=== modified file 'mysql-test/suite/backup/t/backup_logs.test'
--- a/mysql-test/suite/backup/t/backup_logs.test	2009-10-12 09:08:34 +0000
+++ b/mysql-test/suite/backup/t/backup_logs.test	2009-11-10 17:24:18 +0000
@@ -289,12 +289,6 @@ connection con1;
 SET time_zone='+0:00';
 SELECT now() INTO @stop_backup;
 
---echo We calculate the timedifference between backup start time and stop
---echo time. If this difference is '0', then backup start time and stop time
---echo are same.
-
-SELECT timediff(@stop_backup, @start_backup) > 5;
-
 --echo
 --echo Now verify actual start time / stop time of backup and start time /
 --echo stop time from backup_history table. If the both times are same, 


Attachment: [text/bzr-bundle] bzr/[e-mail]