From: Date: July 3 2009 8:21pm Subject: bzr push into mysql-6.0-backup branch (ingo.struewing:2839 to 2840) WL#4771 List-Archive: http://lists.mysql.com/commits/77935 Message-Id: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_EZWLX4IR2Fw8BbEuF5Cg6A)" --Boundary_(ID_EZWLX4IR2Fw8BbEuF5Cg6A) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline 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. @ .bzrignore WL#4771 - Online Backup: Test cross-platform compatibility Removed mysql-test/backup_xpfm_compat_lctn*.bak. Backup image files are now created in mysql-test/var, which is ignored in total. @ 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: .bzrignore 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 2839 Ingo Struewing 2009-07-03 WL#4771 - Online Backup: Test cross-platform compatibility Added suite/backup/std_data to mysql-test/Makefile.am It contains the new backup file images required for the cross-platform compatibility tests. @ mysql-test/Makefile.am WL#4771 - Online Backup: Test cross-platform compatibility Added suite/backup/std_data modified: mysql-test/Makefile.am === modified file '.bzrignore' --- a/.bzrignore 2009-06-29 15:16:27 +0000 +++ b/.bzrignore 2009-07-03 18:11:58 +0000 @@ -2022,6 +2022,3 @@ storage/maria/maria_non_trans_log libmysqld/examples/mysqltest.cc libmysqld/bml.cc mysql-test/mysql-test-lcov -mysql-test/backup_xpfm_compat_lctn0.bak -mysql-test/backup_xpfm_compat_lctn1.bak -mysql-test/backup_xpfm_compat_lctn2.bak === 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:11:58 +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:11:58 +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:11:58 +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:11:58 +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_EZWLX4IR2Fw8BbEuF5Cg6A) 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: b988bd3b11974a47d9d63ae8816e852b2f1c64e9 # timestamp: 2009-07-03 20:21:58 +0200 # source_branch: file:///home2/mydev/bzrroot/mysql-6.0-backup/ # base_revision_id: ingo.struewing@stripped\ # 0lsj0a2nuvslex8g # # Begin bundle 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 3KQXY0cx8j1azG/vLD/4u5IpwoSG8XE9oA== --Boundary_(ID_EZWLX4IR2Fw8BbEuF5Cg6A)--