From: Date: July 3 2009 8:08pm Subject: bzr commit into mysql-6.0-backup branch (ingo.struewing:2840) WL#4771 List-Archive: http://lists.mysql.com/commits/77934 Message-Id: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_rIkAPn3wpyoaYXMDdxS0pA)" --Boundary_(ID_rIkAPn3wpyoaYXMDdxS0pA) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline #At file:///home2/mydev/bzrroot/mysql-6.0-wl4771-3/ based on revid:ingo.struewing@stripped 2840 Ingo Struewing 2009-07-03 WL#4771 - Online Backup: Test cross-platform compatibility Backup image files did not appear in the PB2 archives. PB2 saves one archive after build, and one after test. The latter contains the mysql-test/var tree only. So it was useless to copy the files to mysql-test. Changed from copying backup image file to mysql-test/ to setting backupdir to $MYSQLTEST_VARDIR and backing up there directly. @ mysql-test/suite/backup/include/backup_xpfm_compat_backup.inc WL#4771 - Online Backup: Test cross-platform compatibility Changed from copying backup image file to mysql-test/ to setting backupdir to $MYSQLTEST_VARDIR and backing up there directly. @ mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result WL#4771 - Online Backup: Test cross-platform compatibility Updated test result. @ mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn1.result WL#4771 - Online Backup: Test cross-platform compatibility Updated test result. @ mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn2.result WL#4771 - Online Backup: Test cross-platform compatibility Updated test result. modified: mysql-test/suite/backup/include/backup_xpfm_compat_backup.inc mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn1.result mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn2.result === modified file 'mysql-test/suite/backup/include/backup_xpfm_compat_backup.inc' --- a/mysql-test/suite/backup/include/backup_xpfm_compat_backup.inc 2009-07-02 17:42:10 +0000 +++ b/mysql-test/suite/backup/include/backup_xpfm_compat_backup.inc 2009-07-03 18:08:39 +0000 @@ -18,9 +18,6 @@ # # Ingo Struewing, 2009-06-02 # -# Get backup directory into a variable. ---let $BACKUPDIR= `SELECT @@backupdir`; -# --disable_warnings DROP DATABASE IF EXISTS bup_xpfm_compat_db1; DROP DATABASE IF EXISTS BUP_XPFM_COMPAT_DB2; @@ -865,33 +862,28 @@ GRANT EXECUTE ON FUNCTION BupXPfmCompat_ --source $SHOW_OBJECTS # --echo # +--echo # Set backupdir = '\$MYSQLTEST_VARDIR' +--echo # +--disable_query_log +eval SET GLOBAL backupdir = '$MYSQLTEST_VARDIR'; +--enable_query_log +# +--echo # --echo # Backup. --echo # --error 0, 1 ---remove_file $BACKUPDIR/bup_xpfm_compat.bak +--remove_file $MYSQLTEST_VARDIR/$IMAGE_FILE --replace_column 1 # -BACKUP DATABASE +eval BACKUP DATABASE bup_xpfm_compat_db1, BUP_XPFM_COMPAT_DB2, BupXPfmCompat_db3 - TO 'bup_xpfm_compat.bak'; -# -# We could have set 'backupdir' to $MYSQL_TEST_DIR and used -# $IMAGE_FILE in the BACKUP statement directly. -# I feel that copying the file makes the destination more explicit. -# ---echo # ---echo # Copy backup image file to mysql-test/$IMAGE_FILE ---echo # for manual copy to std_data/. ---echo # ---error 0, 1 ---remove_file $IMAGE_FILE ---copy_file $BACKUPDIR/bup_xpfm_compat.bak $IMAGE_FILE + TO '$IMAGE_FILE'; # --echo # --echo # Cleanup. --echo # ---remove_file $BACKUPDIR/bup_xpfm_compat.bak +SET GLOBAL backupdir = DEFAULT; DROP USER 'bup_user1'@'%'; DROP USER 'BUP_USER2'; DROP USER 'BupUser3'@'%'; === 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 2009-07-02 17:42:10 +0000 +++ b/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn0.result 2009-07-03 18:08:39 +0000 @@ -1647,22 +1647,22 @@ BUP_XPFM_COMPAT_DB2 event1 DELETE FROM B BUP_XPFM_COMPAT_DB2 EVENT2 DELETE FROM BUP_XPFM_COMPAT_DB2.TABLE2 WHERE c13 > 100 BUP_XPFM_COMPAT_DB2 EvEnt3 DELETE FROM BUP_XPFM_COMPAT_DB2.TaBle3 WHERE c13 > 100 # +# Set backupdir = '$MYSQLTEST_VARDIR' +# +# # Backup. # BACKUP DATABASE bup_xpfm_compat_db1, BUP_XPFM_COMPAT_DB2, BupXPfmCompat_db3 -TO 'bup_xpfm_compat.bak'; +TO 'backup_xpfm_compat_lctn0.bak'; backup_id # # -# Copy backup image file to mysql-test/backup_xpfm_compat_lctn0.bak -# for manual copy to std_data/. -# -# # Cleanup. # +SET GLOBAL backupdir = DEFAULT; DROP USER 'bup_user1'@'%'; DROP USER 'BUP_USER2'; DROP USER 'BupUser3'@'%'; === modified file 'mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn1.result' --- a/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn1.result 2009-07-02 17:42:10 +0000 +++ b/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn1.result 2009-07-03 18:08:39 +0000 @@ -1647,22 +1647,22 @@ bup_xpfm_compat_db2 event1 DELETE FROM B bup_xpfm_compat_db2 EVENT2 DELETE FROM BUP_XPFM_COMPAT_DB2.TABLE2 WHERE c13 > 100 bup_xpfm_compat_db2 EvEnt3 DELETE FROM BUP_XPFM_COMPAT_DB2.TaBle3 WHERE c13 > 100 # +# Set backupdir = '$MYSQLTEST_VARDIR' +# +# # Backup. # BACKUP DATABASE bup_xpfm_compat_db1, BUP_XPFM_COMPAT_DB2, BupXPfmCompat_db3 -TO 'bup_xpfm_compat.bak'; +TO 'backup_xpfm_compat_lctn1.bak'; backup_id # # -# Copy backup image file to mysql-test/backup_xpfm_compat_lctn1.bak -# for manual copy to std_data/. -# -# # Cleanup. # +SET GLOBAL backupdir = DEFAULT; DROP USER 'bup_user1'@'%'; DROP USER 'BUP_USER2'; DROP USER 'BupUser3'@'%'; === modified file 'mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn2.result' --- a/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn2.result 2009-07-02 17:42:10 +0000 +++ b/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn2.result 2009-07-03 18:08:39 +0000 @@ -1647,22 +1647,22 @@ bup_xpfm_compat_db2 event1 DELETE FROM B bup_xpfm_compat_db2 EVENT2 DELETE FROM BUP_XPFM_COMPAT_DB2.TABLE2 WHERE c13 > 100 bup_xpfm_compat_db2 EvEnt3 DELETE FROM BUP_XPFM_COMPAT_DB2.TaBle3 WHERE c13 > 100 # +# Set backupdir = '$MYSQLTEST_VARDIR' +# +# # Backup. # BACKUP DATABASE bup_xpfm_compat_db1, BUP_XPFM_COMPAT_DB2, BupXPfmCompat_db3 -TO 'bup_xpfm_compat.bak'; +TO 'backup_xpfm_compat_lctn2.bak'; backup_id # # -# Copy backup image file to mysql-test/backup_xpfm_compat_lctn2.bak -# for manual copy to std_data/. -# -# # Cleanup. # +SET GLOBAL backupdir = DEFAULT; DROP USER 'bup_user1'@'%'; DROP USER 'BUP_USER2'; DROP USER 'BupUser3'@'%'; --Boundary_(ID_rIkAPn3wpyoaYXMDdxS0pA) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/ingo.struewing@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/ingo.struewing@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ingo.struewing@stripped # target_branch: file:///home2/mydev/bzrroot/mysql-6.0-wl4771-3/ # testament_sha1: 72d55a91afb5c4edcf4d5147e3543d6e160da164 # timestamp: 2009-07-03 20:08:44 +0200 # source_branch: file:///home2/mydev/bzrroot/mysql-6.0-backup/ # base_revision_id: ingo.struewing@stripped\ # 0lsj0a2nuvslex8g # # Begin bundle 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 FDHKhFefzOhNvS1W31g/+LuSKcKEgf54gLg= --Boundary_(ID_rIkAPn3wpyoaYXMDdxS0pA)--