bzr commit into mysql-6.0-backup branch (cbell:2681)

[Chuck Bell]

#At file:///D:/source/bzr/mysql-6.0-pb-fixes/

 2681 Chuck Bell	2008-08-21
      PB Fixes:
      
      Fixed sprintf format specification for platforms that bother to check that sort of
thing.
      Changed perl command in backup_db_grants to do a backup of the file being changed to
satisfy weird perl behaviour on Windows 2003 machine.
modified:
  mysql-test/t/backup_db_grants.test
  sql/backup/backup_aux.h

=== modified file 'mysql-test/t/backup_db_grants.test'
--- a/mysql-test/t/backup_db_grants.test	2008-08-21 15:35:36 +0000
+++ b/mysql-test/t/backup_db_grants.test	2008-08-21 19:28:49 +0000
@@ -105,7 +105,7 @@ SHOW GRANTS FOR 'no_user'@'%';
 
 --echo Now demonstrate what happens when grants are altered in backup image.
 
---exec perl -pi -e "s/ON bup/ON boo/" $MYSQLTEST_VARDIR/master-data/bup_db_grants.bak 
+--exec perl -pi.bak -e "s/ON bup/ON boo/" $MYSQLTEST_VARDIR/master-data/bup_db_grants.bak

 --echo Run Restore
 --error ER_BACKUP_GRANT_WRONG_DB
 RESTORE FROM 'bup_db_grants.bak';
@@ -126,6 +126,8 @@ DROP USER 'no_user'@'%';
 FLUSH PRIVILEGES;
 
 --remove_file $MYSQLTEST_VARDIR/master-data/bup_db_grants.bak
+
+--remove_file $MYSQLTEST_VARDIR/master-data/bup_db_grants.bak.bak
 
 --echo Now test for encoded user names with an x40 in the middle.
 

=== modified file 'sql/backup/backup_aux.h'
--- a/sql/backup/backup_aux.h	2008-08-20 13:23:10 +0000
+++ b/sql/backup/backup_aux.h	2008-08-21 19:28:49 +0000
@@ -50,7 +50,7 @@ namespace backup {
   Constants for appending uniqueness to privileges in backup catalog.
 */
 #define UNIQUE_PRIV_KEY_LEN 9
-#define UNIQUE_PRIV_KEY_FORMAT "%08d"
+#define UNIQUE_PRIV_KEY_FORMAT "%08lu"
 
 /**
   Local version of LEX_STRING structure.