bzr commit into mysql-6.0-backup branch (ingo.struewing:2844)

[Ingo Struewing]

#At file:///home2/mydev/bzrroot/mysql-6.0-events-1/ based on revid:charles.bell@stripped

 2844 Ingo Struewing	2009-07-02
      Wrong order of events, if test is repeated.
      Drop events in a certain order, so that they are re-used in the
      old order if test is repeated.
     @ mysql-test/suite/backup/r/backup_client.result
        Wrong order of events, if test is repeated.
        Fixed result.
     @ mysql-test/suite/backup/t/backup_client.test
        Wrong order of events, if test is repeated.
        Drop events in a certain order, so that they are re-used in the
        old order if test is repeated.

    modified:
      mysql-test/suite/backup/r/backup_client.result
      mysql-test/suite/backup/t/backup_client.test
=== modified file 'mysql-test/suite/backup/r/backup_client.result'
--- a/mysql-test/suite/backup/r/backup_client.result	2009-07-01 20:42:26 +0000
+++ b/mysql-test/suite/backup/r/backup_client.result	2009-07-02 10:54:43 +0000
@@ -4790,6 +4790,10 @@ Validity time: #
 Finish   time: #
 No binlog information
 #========^^^^^^^^========
+DROP EVENT mysqltest2.e2;
+DROP EVENT mysqltest2.e1;
+DROP EVENT mysqltest1.e2;
+DROP EVENT mysqltest1.e1;
 DROP DATABASE mysqltest1;
 DROP DATABASE mysqltest2;
 DROP DATABASE mysqltest3;

=== modified file 'mysql-test/suite/backup/t/backup_client.test'
--- a/mysql-test/suite/backup/t/backup_client.test	2009-06-30 07:51:04 +0000
+++ b/mysql-test/suite/backup/t/backup_client.test	2009-07-02 10:54:43 +0000
@@ -496,6 +496,17 @@ exec $MYSQL_BACKUP -v --all --snapshots 
 --echo #========^^^^^^^^========
 #
 --remove_file $BACKUPDIR/mysqltest.bgz
+#
+# We drop the events explicitly here. They seem to go into a chain
+# and the order in which they are dropped is the reverse order in
+# which they are listed by INFORMATION_SCHEMA. This is just a wild guess,
+# but it solves a problem, detected on pushbuild on 2009-07-01.
+#
+DROP EVENT mysqltest2.e2;
+DROP EVENT mysqltest2.e1;
+DROP EVENT mysqltest1.e2;
+DROP EVENT mysqltest1.e1;
+#
 DROP DATABASE mysqltest1;
 DROP DATABASE mysqltest2;
 DROP DATABASE mysqltest3;


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