bzr commit into mysql-6.0-backup branch (ingo.struewing:2840) WL#4771

[Ingo Struewing]

#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.
     @ .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
=== 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'@'%';


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