bzr commit into mysql-6.0-backup branch (jorgen.loland:2801) Bug#37762

[Jorgen Loland]

#At file:///localhome/jl208045/mysql/mysql-6.0-backup-37762/

 2801 Jorgen Loland	2009-03-16
      Bug#37762 - backup_triggers_and_events test fails in PB
      
      remove_file failed with error 1 for unknown reason. The directory structure, and
therefore the remove_file command has changed since. Trying to reenable test in pb since
it does no longer fail localy.
modified:
  mysql-test/suite/backup/r/backup_triggers_and_events.result
  mysql-test/suite/backup/t/backup_triggers_and_events.test
  mysql-test/suite/backup/t/disabled.def

per-file messages:
  mysql-test/suite/backup/r/backup_triggers_and_events.result
    New resultfile after adding debug cleanup. The cleanup was fixed in unknown push, but
a new resultfile was not pushed because the test was disabled.
  mysql-test/suite/backup/t/backup_triggers_and_events.test
    Changing to default remove_file syntax
  mysql-test/suite/backup/t/disabled.def
    Reenable backup_triggers_and_events
=== modified file 'mysql-test/suite/backup/r/backup_triggers_and_events.result'
--- a/mysql-test/suite/backup/r/backup_triggers_and_events.result	2008-10-24 08:11:18
+0000
+++ b/mysql-test/suite/backup/r/backup_triggers_and_events.result	2009-03-16 13:06:31
+0000
@@ -189,6 +189,7 @@ AND timediff(ts,@start) < 2;
 count(*) > 0
 1
 Cleaning up.
+SET DEBUG_SYNC = 'RESET';
 DROP EVENT test.ev;
 DROP TRIGGER test.trg;
 DROP TABLE test.logt;

=== modified file 'mysql-test/suite/backup/t/backup_triggers_and_events.test'
--- a/mysql-test/suite/backup/t/backup_triggers_and_events.test	2009-02-26 11:21:33 +0000
+++ b/mysql-test/suite/backup/t/backup_triggers_and_events.test	2009-03-16 13:06:31 +0000
@@ -8,7 +8,7 @@
 let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 --disable_warnings
 --error 0,1
-remove_file $MYSQLD_BACKUPDIR/db.bak;
+--remove_file $MYSQLD_BACKUPDIR/db.bak
 --enable_warnings
 
 SET GLOBAL event_scheduler=off;
@@ -214,4 +214,5 @@ DROP TRIGGER test.trg;
 DROP TABLE test.logt;
 DROP TABLE test.t1;
 DROP DATABASE db;
-remove_file $MYSQLD_BACKUPDIR/db.bak;
+
+--remove_file $MYSQLD_BACKUPDIR/db.bak

=== modified file 'mysql-test/suite/backup/t/disabled.def'
--- a/mysql-test/suite/backup/t/disabled.def	2009-02-20 16:40:19 +0000
+++ b/mysql-test/suite/backup/t/disabled.def	2009-03-16 13:06:31 +0000
@@ -10,7 +10,6 @@
 #
 ##############################################################################
 backup_no_engine              : Bug#36021 2008-04-13 rsomla server crashes when openning
table with unknown storage engine
-backup_triggers_and_events    : Bug#37762 2008-07-01 rafal Test fails on remove_file for
unknown reasons
 backup_no_data                : Bug#42756 2009-02-11 jorgen Test db state not preserved 
 backup_ddl_blocker            : Bug#42756 2009-02-11 jorgen Test db state not preserved 
 backup_maria_other_instance   : Bug#42924 2009-02-17 serg