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

[Chuck Bell]

#At file:///C:/source/bzr/mysql-6.0-test-backup/ based on revid:charles.bell@stripped

 2797 Chuck Bell	2009-03-10
      Disabled portions of test pending patch for BUG#43549.
      modified:
        mysql-test/suite/backup/r/backup_objects_dependency.result
        mysql-test/suite/backup/t/backup_objects_dependency.test

=== modified file 'mysql-test/suite/backup/r/backup_objects_dependency.result'
--- a/mysql-test/suite/backup/r/backup_objects_dependency.result	2009-03-03 22:15:16 +0000
+++ b/mysql-test/suite/backup/r/backup_objects_dependency.result	2009-03-11 01:14:44 +0000
@@ -536,9 +536,6 @@ Table	Create Table
 tp	CREATE TABLE `tp` (
   `a` varchar(4) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SELECT * FROM ob3.log;
-pos	msg
-1	user1 created
 CALL show_objects('ob1');
 TABLE_NAME	TABLE_TYPE
 t11	BASE TABLE
@@ -848,10 +845,6 @@ Table	Create Table
 tp	CREATE TABLE `tp` (
   `a` varchar(4) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SELECT * FROM ob3.log;
-pos	msg
-1	user1 created
-2	user2 created
 
 CREATE DEPENDENT TESTS
 ======================
@@ -1131,9 +1124,6 @@ cash	1000
 dd	2000
 dd	2000
 dd	2000
-SELECT * FROM ob3.log;
-pos	msg
-1	user1 created
 
 # Drop the procedure(ob1.p11) in which procedure(ob2.p23) depends
 Perform restore again to get all objects back.
@@ -1824,9 +1814,6 @@ collation_connection	#
 Database Collation	latin1_swedish_ci
 CALL ob3.fire('user3 created');
 ERROR 42S02: Table 'ob3.msg' doesn't exist
-SELECT * FROM ob3.log;
-pos	msg
-1	user1 created
 # Test cleanup section
 REVOKE ALL ON *.* FROM tom@'%';
 DROP USER tom@'%';

=== modified file 'mysql-test/suite/backup/t/backup_objects_dependency.test'
--- a/mysql-test/suite/backup/t/backup_objects_dependency.test	2009-03-03 22:15:16 +0000
+++ b/mysql-test/suite/backup/t/backup_objects_dependency.test	2009-03-11 01:14:44 +0000
@@ -432,8 +432,12 @@ SHOW CREATE TABLE ob3.tp;
 SHOW CREATE TABLE ob2.t23;
 SHOW CREATE TABLE ob3.tp;
 
+#
+# BUG#43549 This portion disabled because the firing of the event is
+#           non-deterministic.
+#
 # Verify event ob3.ev is fired
-SELECT * FROM ob3.log;
+#SELECT * FROM ob3.log;
 
 # Checking tables and other objects in databases.
 CALL show_objects('ob1');
@@ -523,7 +527,12 @@ CALL ob3.p31('TEST');
 SHOW CREATE TABLE ob3.tp;
 SHOW CREATE TABLE ob2.t23;
 SHOW CREATE TABLE ob3.tp;
-SELECT * FROM ob3.log;
+
+#
+# BUG#43549 This portion disabled because the firing of the event is
+#           non-deterministic.
+#
+#SELECT * FROM ob3.log;
 
 --echo
 --echo CREATE DEPENDENT TESTS
@@ -636,7 +645,13 @@ GRANT ALL ON *.* TO tom@'%';
 INSERT INTO ob3.t32 VALUES(97);
 SELECT * FROM ob3.t32;
 SELECT * FROM ob1.t14;
-SELECT * FROM ob3.log;
+
+#
+# BUG#43549 This portion disabled because the firing of the event is
+#           non-deterministic.
+#
+#SELECT * FROM ob3.log;
+
 # Note that we will see both values 97 and 98. trg32 will not update value
 # in t14 if user is not present.
 # Note that if user is not present, event will not be fired
@@ -723,7 +738,12 @@ Let $db=ob3;
 # Try to fire event
 --error ER_NO_SUCH_TABLE
 CALL ob3.fire('user3 created');
-SELECT * FROM ob3.log;
+
+#
+# BUG#43549 This portion disabled because the firing of the event is
+#           non-deterministic.
+#
+#SELECT * FROM ob3.log;
 
 --echo # Test cleanup section