bzr push into mysql-6.0-backup branch (sanjay.manwani:2934 to 2935) Bug#49899

[Sanjay Manwani]

 2935 Sanjay Manwani	2010-01-15
      Bug#49899 - The backup_xpfm_compat_backup_lctn2 failing on
                  Windows PB machines
      
      There was a whitespace  problem with the push on 
      the result file:
      mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result
      
      Committed this file after generating it on Linux.
     @ mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result
        Bug#49899 - The backup_xpfm_compat_backup_lctn2 failing on
                    Windows PB machines

    modified:
      mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result
 2934 Chuck Bell	2010-01-14
      BUG#50313 : The test backup_thd_delete has non-deterministic output
      
      The output of SHOW PROCESSLIST can be non-deterministic on some machines
      depending on load and timing of the test sequences.
      
      The output of SHOW PROCESSLIST is irrelevant for the test anyway. 
      We just need to prove that it doesn't crash.
     @ mysql-test/suite/backup/t/backup_thd_delete.test
        Mask output of SHOW PROCESSLIST.
        Does not require a new result file.
        Added missing reap.

    modified:
      mysql-test/suite/backup/t/backup_thd_delete.test
=== modified file 'mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result'
--- a/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result	2010-01-11 13:51:22 +0000
+++ b/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result	2010-01-15 14:18:19 +0000
@@ -742,34 +742,34 @@ GRANT EXECUTE ON PROCEDURE BUP_XPFM_COMP
 GRANT EXECUTE ON PROCEDURE BupXPfmCompat_db3.PrOc3 TO 'BupUser3'@'%';
 GRANT EXECUTE ON FUNCTION bup_xpfm_compat_db1.func1 TO 'bup_user1'@'%';
 GRANT EXECUTE ON FUNCTION BUP_XPFM_COMPAT_DB2.FUNC2 TO 'BUP_USER2';
-GRANT EXECUTE ON FUNCTION BupXPfmCompat_db3.FuNc3 TO 'BupUser3'@'%';
-SHOW GRANTS FOR 'no_user'@'%';
-Grants for no_user@%
-GRANT ALL PRIVILEGES ON `bup_xpfm_compat_db1`.* TO 'no_user'@'%'
-GRANT USAGE ON *.* TO 'no_user'@'%'
-SHOW GRANTS FOR 'bup_user1'@'%';
-Grants for bup_user1@%
-GRANT ALL PRIVILEGES ON `bup_xpfm_compat_db1`.* TO 'bup_user1'@'%'
-GRANT EXECUTE ON FUNCTION `bup_xpfm_compat_db1`.`func1` TO 'bup_user1'@'%'
-GRANT EXECUTE ON PROCEDURE `bup_xpfm_compat_db1`.`proc1` TO 'bup_user1'@'%'
-GRANT SELECT (c13) ON `BupXPfmCompat_db3`.`TaBle3` TO 'bup_user1'@'%'
-GRANT SELECT ON `BUP_XPFM_COMPAT_DB2`.`TABLE2` TO 'bup_user1'@'%'
-GRANT USAGE ON *.* TO 'bup_user1'@'%'
-SHOW GRANTS FOR 'BUP_USER2';
-Grants for BUP_USER2@%
-GRANT ALL PRIVILEGES ON `BUP_XPFM_COMPAT_DB2`.* TO 'BUP_USER2'@'%'
-GRANT EXECUTE ON FUNCTION `BUP_XPFM_COMPAT_DB2`.`func2` TO 'BUP_USER2'@'%'
-GRANT EXECUTE ON PROCEDURE `BUP_XPFM_COMPAT_DB2`.`proc2` TO 'BUP_USER2'@'%'
-GRANT SELECT (c48), INSERT (c48) ON `bup_xpfm_compat_db1`.`table1` TO 'BUP_USER2'@'%'
-GRANT SELECT ON `BupXPfmCompat_db3`.`TaBle3` TO 'BUP_USER2'@'%'
-GRANT USAGE ON *.* TO 'BUP_USER2'@'%'
-SHOW GRANTS FOR 'BupUser3'@'%';
-Grants for BupUser3@%
-GRANT ALL PRIVILEGES ON `BupXPfmCompat_db3`.* TO 'BupUser3'@'%'
-GRANT EXECUTE ON FUNCTION `BupXPfmCompat_db3`.`func3` TO 'BupUser3'@'%'
-GRANT EXECUTE ON PROCEDURE `BupXPfmCompat_db3`.`proc3` TO 'BupUser3'@'%'
-GRANT INSERT (c13) ON `BUP_XPFM_COMPAT_DB2`.`TABLE2` TO 'BupUser3'@'%'
-GRANT SELECT ON `bup_xpfm_compat_db1`.`table1` TO 'BupUser3'@'%'
+GRANT EXECUTE ON FUNCTION BupXPfmCompat_db3.FuNc3 TO 'BupUser3'@'%';
+SHOW GRANTS FOR 'no_user'@'%';
+Grants for no_user@%
+GRANT ALL PRIVILEGES ON `bup_xpfm_compat_db1`.* TO 'no_user'@'%'
+GRANT USAGE ON *.* TO 'no_user'@'%'
+SHOW GRANTS FOR 'bup_user1'@'%';
+Grants for bup_user1@%
+GRANT ALL PRIVILEGES ON `bup_xpfm_compat_db1`.* TO 'bup_user1'@'%'
+GRANT EXECUTE ON FUNCTION `bup_xpfm_compat_db1`.`func1` TO 'bup_user1'@'%'
+GRANT EXECUTE ON PROCEDURE `bup_xpfm_compat_db1`.`proc1` TO 'bup_user1'@'%'
+GRANT SELECT (c13) ON `BupXPfmCompat_db3`.`TaBle3` TO 'bup_user1'@'%'
+GRANT SELECT ON `BUP_XPFM_COMPAT_DB2`.`TABLE2` TO 'bup_user1'@'%'
+GRANT USAGE ON *.* TO 'bup_user1'@'%'
+SHOW GRANTS FOR 'BUP_USER2';
+Grants for BUP_USER2@%
+GRANT ALL PRIVILEGES ON `BUP_XPFM_COMPAT_DB2`.* TO 'BUP_USER2'@'%'
+GRANT EXECUTE ON FUNCTION `BUP_XPFM_COMPAT_DB2`.`func2` TO 'BUP_USER2'@'%'
+GRANT EXECUTE ON PROCEDURE `BUP_XPFM_COMPAT_DB2`.`proc2` TO 'BUP_USER2'@'%'
+GRANT SELECT (c48), INSERT (c48) ON `bup_xpfm_compat_db1`.`table1` TO 'BUP_USER2'@'%'
+GRANT SELECT ON `BupXPfmCompat_db3`.`TaBle3` TO 'BUP_USER2'@'%'
+GRANT USAGE ON *.* TO 'BUP_USER2'@'%'
+SHOW GRANTS FOR 'BupUser3'@'%';
+Grants for BupUser3@%
+GRANT ALL PRIVILEGES ON `BupXPfmCompat_db3`.* TO 'BupUser3'@'%'
+GRANT EXECUTE ON FUNCTION `BupXPfmCompat_db3`.`func3` TO 'BupUser3'@'%'
+GRANT EXECUTE ON PROCEDURE `BupXPfmCompat_db3`.`proc3` TO 'BupUser3'@'%'
+GRANT INSERT (c13) ON `BUP_XPFM_COMPAT_DB2`.`TABLE2` TO 'BupUser3'@'%'
+GRANT SELECT ON `bup_xpfm_compat_db1`.`table1` TO 'BupUser3'@'%'
 GRANT USAGE ON *.* TO 'BupUser3'@'%'
 #
 # Show objects.


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