MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Hema Sridharan Date:February 24 2009 8:58pm
Subject:bzr commit into mysql-6.0 branch (hema:2781) Bug#40849
View as plain text  
#At file:///home/hs221732/review-backup/mysql-6.0-backup/ based on revid:rafal.somla@strippedezogsxr0ik

 2781 Hema Sridharan	2009-02-24
      BUG#40849.
      Most of the backup tests from backup suite and backup engines suite are
      replaced to use backupdir instead of datadir.
      This will help to reduce test failures when there are changes in assumptions
      in usage od datadir.
modified:
  mysql-test/suite/backup/r/backup_backupdir.result
  mysql-test/suite/backup/t/backup.test
  mysql-test/suite/backup/t/backup_backupdir.test
  mysql-test/suite/backup/t/backup_charsets.test
  mysql-test/suite/backup/t/backup_concurrent.test
  mysql-test/suite/backup/t/backup_datatypes.test
  mysql-test/suite/backup/t/backup_db_grants.test
  mysql-test/suite/backup/t/backup_default.test
  mysql-test/suite/backup/t/backup_fkey.test
  mysql-test/suite/backup/t/backup_lock_myisam.test
  mysql-test/suite/backup/t/backup_logs.test
  mysql-test/suite/backup/t/backup_logs_output.test
  mysql-test/suite/backup/t/backup_logs_purge.test
  mysql-test/suite/backup/t/backup_many_dbs.test
  mysql-test/suite/backup/t/backup_maria.test
  mysql-test/suite/backup/t/backup_multi_blocks.test
  mysql-test/suite/backup/t/backup_myisam.test
  mysql-test/suite/backup/t/backup_myisam_coverage.test
  mysql-test/suite/backup/t/backup_myisam_extlocking.test
  mysql-test/suite/backup/t/backup_myisam_sync.test
  mysql-test/suite/backup/t/backup_no_be.test
  mysql-test/suite/backup/t/backup_no_data.test
  mysql-test/suite/backup/t/backup_no_engine.test
  mysql-test/suite/backup/t/backup_nodata_driver.test
  mysql-test/suite/backup/t/backup_objects.test
  mysql-test/suite/backup/t/backup_procedures.test
  mysql-test/suite/backup/t/backup_security.test
  mysql-test/suite/backup/t/backup_snapshot.test
  mysql-test/suite/backup/t/backup_tablespace.test
  mysql-test/suite/backup/t/backup_timeout.test
  mysql-test/suite/backup/t/backup_triggers_and_events.test
  mysql-test/suite/backup/t/backup_views.test
  mysql-test/suite/backup_engines/t/backup_functions.test
  mysql-test/suite/backup_engines/t/backup_online_testing.test
  mysql-test/suite/backup_engines/t/backup_procedures.test
  mysql-test/suite/backup_engines/t/backup_triggers.test

=== modified file 'mysql-test/suite/backup/r/backup_backupdir.result'
--- a/mysql-test/suite/backup/r/backup_backupdir.result	2008-12-24 10:48:24 +0000
+++ b/mysql-test/suite/backup/r/backup_backupdir.result	2009-02-24 20:57:21 +0000
@@ -47,8 +47,8 @@ ERROR HY000: Can't create/write to file 
 Try a backup to an invalid hard path.
 *Actual BACKUP DATABASE command not printed due to non-deterministic path.
 *Performing: 
-*BACKUP DATABASE bup_backupdir TO '$MYSQLTEST_VARDIR/master_data/not/there/either/bup_backupdir6.bak';
-ERROR HY000: Can't create/write to file 'MYSQLTEST_VARDIR/master_data/not/there/either/bup_backupdir6.bak' (Errcode: #)
+*BACKUP DATABASE bup_backupdir TO '$MYSQLTEST_VARDIR/not/there/either/bup_backupdir6.bak';
+ERROR HY000: Can't create/write to file 'MYSQLTEST_VARDIR/not/there/either/bup_backupdir6.bak' (Errcode: #)
 
 Attempt to set the backupdir to something invalid.
 SET @@global.backupdir = 'This_is_really_stupid/not/there/at/all';

=== modified file 'mysql-test/suite/backup/t/backup.test'
--- a/mysql-test/suite/backup/t/backup.test	2009-02-20 09:31:52 +0000
+++ b/mysql-test/suite/backup/t/backup.test	2009-02-24 20:57:21 +0000
@@ -16,9 +16,9 @@ DROP DATABASE IF EXISTS db1;
 DROP DATABASE IF EXISTS db2;
 DROP DATABASE IF EXISTS db3;
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_default.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_default.bak;
 --enable_warnings
 
 CREATE DATABASE db1;
@@ -152,7 +152,7 @@ RESTORE FROM 'test.ba';
 # determine id of RESTORE operation
 SELECT MAX(backup_id) FROM mysql.backup_history INTO @bid;
 
-remove_file $MYSQLD_DATADIR/test.ba;
+remove_file $MYSQLD_BACKUPDIR/test.ba;
 
 SHOW CREATE DATABASE db1;
 SHOW CREATE DATABASE db2;
@@ -195,7 +195,7 @@ SET DEBUG_SYNC= 'RESET';
 #
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/db1.bkp
+--remove_file $MYSQLD_BACKUPDIR/db1.bkp
 CREATE DATABASE db1;
 
 --replace_column 1 #
@@ -231,7 +231,7 @@ FROM mysql.backup_history
 WHERE backup_id = @bid; 
 
 DROP DATABASE db1;
---remove_file $MYSQLD_DATADIR/db1.bkp
+--remove_file $MYSQLD_BACKUPDIR/db1.bkp
 
 
 #
@@ -417,7 +417,7 @@ SELECT * FROM bup_default.t2;
 SELECT COUNT(*) FROM bup_default.t1_blob;
 SELECT COUNT(*) FROM bup_default.wide;
 
-remove_file $MYSQLD_DATADIR/bup_default.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_default.bak;
 --replace_column 1 #
 BACKUP DATABASE bup_default TO 'bup_default.bak';
 
@@ -565,10 +565,10 @@ DROP DATABASE bup_usedb;
 --echo # Cleanup
 --echo #
 
---remove_file $MYSQLD_DATADIR/bup_usedb.bak
---remove_file $MYSQLD_DATADIR/bup_delete.bak
---remove_file $MYSQLD_DATADIR/bup_default_timestamp.bak
---remove_file $MYSQLD_DATADIR/bup_default.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_usedb.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_delete.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_default_timestamp.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_default.bak
 --error 0,1
---remove_file $MYSQLD_DATADIR/test.bak
+--remove_file $MYSQLD_BACKUPDIR/test.bak
 

=== modified file 'mysql-test/suite/backup/t/backup_backupdir.test'
--- a/mysql-test/suite/backup/t/backup_backupdir.test	2008-12-24 10:48:24 +0000
+++ b/mysql-test/suite/backup/t/backup_backupdir.test	2009-02-24 20:57:21 +0000
@@ -92,14 +92,14 @@ BACKUP DATABASE bup_backupdir TO '../not
 
 --echo *Actual BACKUP DATABASE command not printed due to non-deterministic path.
 --echo *Performing: 
---echo *BACKUP DATABASE bup_backupdir TO '\$MYSQLTEST_VARDIR/master_data/not/there/either/bup_backupdir6.bak';
+--echo *BACKUP DATABASE bup_backupdir TO '\$MYSQLTEST_VARDIR/not/there/either/bup_backupdir6.bak';
 # Do not print the SQL command to result file because dir is not deterministic across hosts
 --disable_query_log
 # Replace actual dir in error message because $MYSQLTEST_VARDIR is not deterministic
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --replace_regex /Errcode: [0-9]+/Errcode: #/
 --error 1
---eval BACKUP DATABASE bup_backupdir TO '$MYSQLTEST_VARDIR/master_data/not/there/either/bup_backupdir6.bak';
+--eval BACKUP DATABASE bup_backupdir TO '$MYSQLTEST_VARDIR/not/there/either/bup_backupdir6.bak';
 --enable_query_log
 
 --echo

=== modified file 'mysql-test/suite/backup/t/backup_charsets.test'
--- a/mysql-test/suite/backup/t/backup_charsets.test	2008-10-29 08:45:14 +0000
+++ b/mysql-test/suite/backup/t/backup_charsets.test	2009-02-24 20:57:21 +0000
@@ -24,9 +24,9 @@
 disable_warnings;
 DROP DATABASE IF EXISTS backup_cs;
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 error 0,1;
-remove_file $MYSQLD_DATADIR/backup_cs.bak;
+remove_file $MYSQLD_BACKUPDIR/backup_cs.bak;
 enable_warnings;
 
 # TODO: Change to MyISAM when problems with this engine are fixed.

=== modified file 'mysql-test/suite/backup/t/backup_concurrent.test'
--- a/mysql-test/suite/backup/t/backup_concurrent.test	2008-12-06 00:24:23 +0000
+++ b/mysql-test/suite/backup/t/backup_concurrent.test	2009-02-24 20:57:21 +0000
@@ -19,13 +19,13 @@ SET DEBUG_SYNC= 'reset';
 DROP DATABASE IF EXISTS backup_concurrent;
 --enable_warnings
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/backup1;
+remove_file $MYSQLD_BACKUPDIR/backup1;
 --error 0,1
-remove_file $MYSQLD_DATADIR/backup2;
+remove_file $MYSQLD_BACKUPDIR/backup2;
 --error 0,1
-remove_file $MYSQLD_DATADIR/backup3;
+remove_file $MYSQLD_BACKUPDIR/backup3;
 
 CREATE DATABASE backup_concurrent;
 USE backup_concurrent;
@@ -131,6 +131,6 @@ reap;
 DROP DATABASE backup_concurrent;
 SET DEBUG_SYNC= 'reset';
 
-remove_file $MYSQLD_DATADIR/backup1;
-remove_file $MYSQLD_DATADIR/backup3;
+remove_file $MYSQLD_BACKUPDIR/backup1;
+remove_file $MYSQLD_BACKUPDIR/backup3;
 

=== modified file 'mysql-test/suite/backup/t/backup_datatypes.test'
--- a/mysql-test/suite/backup/t/backup_datatypes.test	2009-02-01 13:26:18 +0000
+++ b/mysql-test/suite/backup/t/backup_datatypes.test	2009-02-24 20:57:21 +0000
@@ -17,10 +17,10 @@ connect (breakpoints,localhost,root,,);
 --echo starting the test for backup
 --echo
 ##############################################################
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_datatype.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_datatype.bak
 
 #Create Database and tables with different datatypes for this test.
 
@@ -140,5 +140,5 @@ SET NAMES utf8;
 
 DROP DATABASE `¥ü`;
 
---remove_file $MYSQLD_DATADIR/bup_datatype.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_datatype.bak
 

=== modified file 'mysql-test/suite/backup/t/backup_db_grants.test'
--- a/mysql-test/suite/backup/t/backup_db_grants.test	2008-12-13 19:55:44 +0000
+++ b/mysql-test/suite/backup/t/backup_db_grants.test	2009-02-24 20:57:21 +0000
@@ -9,7 +9,7 @@ disable_query_log;
 call mtr.add_suppression("Backup:");
 call mtr.add_suppression("Restore:");
 enable_query_log;
-let MYSQLD_DATADIR= `select @@datadir`;
+let MYSQLD_BACKUPDIR= `select @@backupdir`;
 
 --disable_warnings
 DROP DATABASE IF EXISTS bup_db_grants;
@@ -116,7 +116,7 @@ SHOW GRANTS FOR 'no_user'@'%';
 #
 #--echo Now demonstrate what happens when grants are altered in backup image.
 #
-#--exec perl -pi.bak -e "s/ON bup/ON boo/" $MYSQLTEST_VARDIR/master-data/bup_db_grants.bak 
+#--exec perl -pi.bak -e "s/ON bup/ON boo/" $MYSQLD_BACKUPDIR/bup_db_grants.bak 
 #--echo Run Restore
 #--error ER_BACKUP_GRANT_WRONG_DB
 #RESTORE FROM 'bup_db_grants.bak';
@@ -136,9 +136,9 @@ DROP USER 'no_user'@'%';
 
 FLUSH PRIVILEGES;
 
---remove_file $MYSQLD_DATADIR/bup_db_grants.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_db_grants.bak
 
-#--remove_file $MYSQLTEST_VARDIR/master-data/bup_db_grants.bak.bak
+#--remove_file $MYSQLD_BACKUPDIR/bup_db_grants.bak.bak
 
 --echo Now test for encoded user names with an x40 in the middle.
 
@@ -203,4 +203,4 @@ DROP DATABASE bup_db_grants;
 DROP DATABASE db2;
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_db_grants.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_db_grants.bak

=== modified file 'mysql-test/suite/backup/t/backup_default.test'
--- a/mysql-test/suite/backup/t/backup_default.test	2009-02-13 12:40:13 +0000
+++ b/mysql-test/suite/backup/t/backup_default.test	2009-02-24 20:57:21 +0000
@@ -5,7 +5,7 @@
 --source include/have_partition.inc
 --source include/not_embedded.inc
 
-let MYSQLD_DATADIR= `select @@datadir`;
+let MYSQLD_BACKUPDIR= `select @@backupdir`;
 
 --echo
 --echo Server should not crash for backup using default driver - CSV
@@ -105,7 +105,7 @@ SELECT * FROM myisam_table ORDER BY i;
 
 DROP DATABASE db1;
 
---remove_file $MYSQLD_DATADIR/bup_csv.bak
-#--remove_file $MYSQLTEST_VARDIR/master-data/bup_falcon.bak
-#--remove_file $MYSQLTEST_VARDIR/master-data/bup_mixed.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_csv.bak
+#--remove_file $MYSQLD_BACKUPDIR/bup_falcon.bak
+#--remove_file $MYSQLD_BACKUPDIR/bup_mixed.bak
 

=== modified file 'mysql-test/suite/backup/t/backup_fkey.test'
--- a/mysql-test/suite/backup/t/backup_fkey.test	2008-12-06 00:24:23 +0000
+++ b/mysql-test/suite/backup/t/backup_fkey.test	2009-02-24 20:57:21 +0000
@@ -12,14 +12,14 @@
 --source include/have_innodb.inc
 --source include/not_embedded.inc
 
-let $MYSQLD_DATADIR=`select @@datadir`;
+let $MYSQLD_BACKUPDIR=`select @@backupdir`;
 
 --disable_warnings
 DROP DATABASE IF EXISTS backup_fkey;
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup_fkey.bak;
+--remove_file $MYSQLD_BACKUPDIR/backup_fkey.bak;
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup_fkey_orig.bak;
+--remove_file $MYSQLD_BACKUPDIR/backup_fkey_orig.bak;
 --enable_warnings
 
 CREATE DATABASE backup_fkey;
@@ -111,7 +111,7 @@ INSERT INTO backup_fkey.t1 VALUES ("06 T
 INSERT INTO backup_fkey.t1 VALUES ("07 Test #2 - foreign key constraints"); 
 
 --echo Backup the data
---remove_file $MYSQLD_DATADIR/backup_fkey.bak
+--remove_file $MYSQLD_BACKUPDIR/backup_fkey.bak
 --replace_column 1 #
 BACKUP DATABASE backup_fkey TO 'backup_fkey.bak';
 
@@ -148,6 +148,6 @@ SHOW VARIABLES LIKE 'foreign_key_checks%
 
 DROP DATABASE backup_fkey;
 
---remove_file $MYSQLD_DATADIR/backup_fkey.bak
---remove_file $MYSQLD_DATADIR/backup_fkey_orig.bak
+--remove_file $MYSQLD_BACKUPDIR/backup_fkey.bak
+--remove_file $MYSQLD_BACKUPDIR/backup_fkey_orig.bak
 

=== modified file 'mysql-test/suite/backup/t/backup_lock_myisam.test'
--- a/mysql-test/suite/backup/t/backup_lock_myisam.test	2009-02-20 09:31:52 +0000
+++ b/mysql-test/suite/backup/t/backup_lock_myisam.test	2009-02-24 20:57:21 +0000
@@ -26,12 +26,12 @@ DROP DATABASE IF EXISTS db2;
 DROP DATABASE IF EXISTS db3;
 --enable_warnings
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 --error 0, 1
-remove_file $MYSQLD_DATADIR/db1.bak;
+remove_file $MYSQLD_BACKUPDIR/db1.bak;
 
 --error 0, 1
-remove_file $MYSQLD_DATADIR/db3.bak;
+remove_file $MYSQLD_BACKUPDIR/db3.bak;
 
 --echo Create database 1 and a table then populate it
 CREATE DATABASE db1;
@@ -214,5 +214,5 @@ DROP DATABASE db1;
 DROP DATABASE db2;
 DROP DATABASE db3;
 
-remove_file $MYSQLD_DATADIR/db1.bak;
-remove_file $MYSQLD_DATADIR/db3.bak;
+remove_file $MYSQLD_BACKUPDIR/db1.bak;
+remove_file $MYSQLD_BACKUPDIR/db3.bak;

=== modified file 'mysql-test/suite/backup/t/backup_logs.test'
--- a/mysql-test/suite/backup/t/backup_logs.test	2009-02-20 16:40:19 +0000
+++ b/mysql-test/suite/backup/t/backup_logs.test	2009-02-24 20:57:21 +0000
@@ -95,7 +95,7 @@ LET $result=`SELECT @backup_id_history =
 
 --echo We can notice that, if result is 1 then backup_id
 --echo from backup_history log and from backup_command is same.
---remove_file $MYSQLD_DATADIR/backup_logs1.bak
+--remove_file $MYSQLD_BACKUPDIR/backup_logs1.bak
 
 #
 # Test 2 - Check output of backup and verify different columns in
@@ -129,7 +129,7 @@ SELECT MAX(backup_id) INTO @bup_id FROM 
 WHERE command LIKE "BACKUP DATABASE backup_logs TO%";
 SELECT operation,num_objects, username, command FROM mysql.backup_history
      WHERE backup_id=@bup_id;
---remove_file $MYSQLD_DATADIR/backup_logs1.bak
+--remove_file $MYSQLD_BACKUPDIR/backup_logs1.bak
 
 connection con3;
 SELECT CURRENT_USER();
@@ -142,7 +142,7 @@ SELECT MAX(backup_id) INTO @bup_id FROM 
 WHERE command LIKE "BACKUP DATABASE backup_logs TO%";
 SELECT operation,num_objects, username, command FROM mysql.backup_history
      WHERE backup_id=@bup_id;
---remove_file $MYSQLD_DATADIR/backup_logs1.bak
+--remove_file $MYSQLD_BACKUPDIR/backup_logs1.bak
 
 --echo Include all objects in database(Databases, tables, procedures and
 --echo functions, views, triggers and events) and perform backup operation.
@@ -340,7 +340,7 @@ SELECT * FROM mysql.backup_progress WHER
 LET FILE_SIZE_HISTORY = `SELECT total_bytes FROM mysql.backup_history WHERE      backup_id = 500`;
 
 perl;
-my $filename = "var/master-data/backup_logs_orig.bak";
+my $filename = "var/mysqld.1/data/backup_logs_orig.bak";
 my $filesize = -s $filename;
 
 if ($filesize ne $ENV{FILE_SIZE_HISTORY})
@@ -459,11 +459,11 @@ BACKUP DATABASE backup_logs to 'backup_l
 --echo The backup id for this command should be 503.
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 
---remove_file $MYSQLD_DATADIR/backup_logs_orig.bak
+--remove_file $MYSQLD_BACKUPDIR/backup_logs_orig.bak
 --echo The backup id for this command should be 504.
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 
---remove_file $MYSQLD_DATADIR/backup_logs_orig.bak
+--remove_file $MYSQLD_BACKUPDIR/backup_logs_orig.bak
 --echo The backup id for this command should be 505.
 BACKUP DATABASE backup_logs to 'backup_logs_orig.bak';
 

=== modified file 'mysql-test/suite/backup/t/backup_logs_output.test'
--- a/mysql-test/suite/backup/t/backup_logs_output.test	2009-02-06 08:28:24 +0000
+++ b/mysql-test/suite/backup/t/backup_logs_output.test	2009-02-24 20:57:21 +0000
@@ -20,6 +20,7 @@ connect (con1,localhost,root,,,,);
 connection con1;
 
 let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR=`select @@backupdir`;
 
 --echo Clear the logs.
 SET @@global.backup_history_log = 'ON';
@@ -91,7 +92,7 @@ FLUSH BACKUP LOGS;
 --file_exists $MYSQLD_DATADIR/backup_progress.log
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_log.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_log.bak
 
 --echo '---Checking backup logs when log_backup_output is TABLE---'
 
@@ -121,7 +122,7 @@ FLUSH BACKUP LOGS;
 --file_exists $MYSQLD_DATADIR/backup_progress.log
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_log.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_log.bak
 
 --echo '---Checking backup logs when log_backup_output is TABLE---'
 --echo '---and the progress log is turned off                   ---'
@@ -156,7 +157,7 @@ FLUSH BACKUP LOGS;
 --file_exists $MYSQLD_DATADIR/backup_progress.log
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_log.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_log.bak
 
 --echo '---Checking backup logs when log_backup_output is TABLE---'
 --echo '---and the history log is turned off                 ---'
@@ -197,7 +198,7 @@ SELECT count(*) FROM mysql.backup_progre
 --file_exists $MYSQLD_DATADIR/backup_progress.log
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_log.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_log.bak
 
 --echo '---Checking backup logs when log_backup_output is FILE---'
 
@@ -232,7 +233,7 @@ PURGE BACKUP LOGS;
 #--exec grep -q "complete" $MYSQLD_DATADIR/backup_progress.log
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_log.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_log.bak
 
 --echo '---Checking backup logs when log_backup_output is TABLE, FILE---'
 
@@ -264,7 +265,7 @@ FLUSH BACKUP LOGS;
 #--exec grep -q "complete" $MYSQLD_DATADIR/backup_progress.log
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_log.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_log.bak
 
 #
 # BUG#40218 Default setting incorrect
@@ -308,5 +309,5 @@ eval SET @@global.backup_progress_log_fi
 SET @@global.log_backup_output = 'TABLE';
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_log.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_log.bak
 

=== modified file 'mysql-test/suite/backup/t/backup_logs_purge.test'
--- a/mysql-test/suite/backup/t/backup_logs_purge.test	2009-02-13 12:40:13 +0000
+++ b/mysql-test/suite/backup/t/backup_logs_purge.test	2009-02-24 20:57:21 +0000
@@ -9,6 +9,7 @@
 --source include/have_innodb.inc
 
 let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR=`select @@backupdir`;
 
 connect (con1,localhost,root,,);
 connect (con2,localhost,root,,);
@@ -119,13 +120,13 @@ SELECT count(*) FROM mysql.backup_progre
 --echo Cleanup the logs and images for later testing.
 PURGE BACKUP LOGS;
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup1.bak
+--remove_file $MYSQLD_BACKUPDIR/backup1.bak
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup2.bak
+--remove_file $MYSQLD_BACKUPDIR/backup2.bak
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup3.bak
+--remove_file $MYSQLD_BACKUPDIR/backup3.bak
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup4.bak
+--remove_file $MYSQLD_BACKUPDIR/backup4.bak
 
 SET @@time_zone = '+00:00';
 
@@ -240,13 +241,13 @@ PURGE BACKUP LOGS;
 
 --echo Get rid of any lingering image files.
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup1.bak
+--remove_file $MYSQLD_BACKUPDIR/backup1.bak
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup2.bak
+--remove_file $MYSQLD_BACKUPDIR/backup2.bak
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup3.bak
+--remove_file $MYSQLD_BACKUPDIR/backup3.bak
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup4.bak
+--remove_file $MYSQLD_BACKUPDIR/backup4.bak
 --error 0,1
 --remove_file $MYSQLTEST_VARDIR/mysqld.1/bup_logs_dir.bak
 
@@ -366,11 +367,11 @@ SELECT count(*) FROM mysql.backup_progre
 # removal of all entries.
 #
 
---remove_file $MYSQLD_DATADIR/backup1.bak
---remove_file $MYSQLD_DATADIR/backup2.bak
---remove_file $MYSQLD_DATADIR/backup3.bak
---remove_file $MYSQLD_DATADIR/backup4.bak
---remove_file $MYSQLD_DATADIR/backup5.bak
+--remove_file $MYSQLD_BACKUPDIR/backup1.bak
+--remove_file $MYSQLD_BACKUPDIR/backup2.bak
+--remove_file $MYSQLD_BACKUPDIR/backup3.bak
+--remove_file $MYSQLD_BACKUPDIR/backup4.bak
+--remove_file $MYSQLD_BACKUPDIR/backup5.bak
 
 --echo First, run some backups.
 
@@ -410,11 +411,11 @@ PURGE BACKUP LOGS TO 999999999;
 SELECT count(*) FROM mysql.backup_history;
 SELECT count(*) FROM mysql.backup_progress;
 
---remove_file $MYSQLD_DATADIR/backup1.bak
---remove_file $MYSQLD_DATADIR/backup2.bak
---remove_file $MYSQLD_DATADIR/backup3.bak
---remove_file $MYSQLD_DATADIR/backup4.bak
---remove_file $MYSQLD_DATADIR/backup5.bak
+--remove_file $MYSQLD_BACKUPDIR/backup1.bak
+--remove_file $MYSQLD_BACKUPDIR/backup2.bak
+--remove_file $MYSQLD_BACKUPDIR/backup3.bak
+--remove_file $MYSQLD_BACKUPDIR/backup4.bak
+--remove_file $MYSQLD_BACKUPDIR/backup5.bak
 
 --echo Run some more backups to generate more rows.
 
@@ -449,15 +450,15 @@ SET DEBUG_SYNC= 'RESET';
 
 DROP DATABASE backup_logs;
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup1.bak
+--remove_file $MYSQLD_BACKUPDIR/backup1.bak
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup2.bak
+--remove_file $MYSQLD_BACKUPDIR/backup2.bak
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup3.bak
+--remove_file $MYSQLD_BACKUPDIR/backup3.bak
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup4.bak
+--remove_file $MYSQLD_BACKUPDIR/backup4.bak
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup5.bak
+--remove_file $MYSQLD_BACKUPDIR/backup5.bak
 
 PURGE BACKUP LOGS;
 

=== modified file 'mysql-test/suite/backup/t/backup_many_dbs.test'
--- a/mysql-test/suite/backup/t/backup_many_dbs.test	2008-10-29 08:45:14 +0000
+++ b/mysql-test/suite/backup/t/backup_many_dbs.test	2009-02-24 20:57:21 +0000
@@ -7,9 +7,9 @@
 --echo Starting regression test for bug 33568
 ##############################################################
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_manydbs.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_manydbs.bak;
 
 --disable_warnings
 DROP DATABASE IF EXISTS db1;
@@ -127,5 +127,5 @@ DROP DATABASE db16;
 DROP DATABASE db17;
 DROP DATABASE db18;
 
-remove_file $MYSQLD_DATADIR/bup_manydbs.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_manydbs.bak;
 

=== modified file 'mysql-test/suite/backup/t/backup_maria.test'
--- a/mysql-test/suite/backup/t/backup_maria.test	2009-02-23 20:19:20 +0000
+++ b/mysql-test/suite/backup/t/backup_maria.test	2009-02-24 20:57:21 +0000
@@ -6,12 +6,12 @@
 --source include/have_debug_sync.inc
 --source include/have_maria.inc
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 
 --disable_warnings
 DROP DATABASE IF EXISTS mysqltest;
 --error 0,1
-remove_file $MYSQLD_DATADIR/test.ba;
+remove_file $MYSQLD_BACKUPDIR/test.ba;
 --enable_warnings
 
 CREATE DATABASE mysqltest;
@@ -52,7 +52,7 @@ CHECKSUM TABLE t1;
 CHECKSUM TABLE t2;
 CHECKSUM TABLE t3;
 CHECKSUM TABLE t4;
-remove_file $MYSQLD_DATADIR/test.ba;
+remove_file $MYSQLD_BACKUPDIR/test.ba;
 
 # Then test that backup is "at end"
 
@@ -128,7 +128,7 @@ SET DEBUG_SYNC= 'now SIGNAL bup_finish';
     CHECK TABLE t4 EXTENDED;
 
 connection default;
-remove_file $MYSQLD_DATADIR/test.ba;
+remove_file $MYSQLD_BACKUPDIR/test.ba;
 
 # Once more, with deletion of all rows
 
@@ -207,7 +207,7 @@ SET DEBUG_SYNC= 'now SIGNAL bup_finish';
 
 connection default;
 drop database mysqltest;
-remove_file $MYSQLD_DATADIR/test.ba;
+remove_file $MYSQLD_BACKUPDIR/test.ba;
 
 # test for BUG#42519 "Maria: RESTORE leads to corrupted table and assertion":
 
@@ -240,5 +240,5 @@ select * from mysqltest.t1;
 --echo connection default: cleanup
 connection default;
 drop database mysqltest;
-remove_file $MYSQLD_DATADIR/test.ba;
+remove_file $MYSQLD_BACKUPDIR/test.ba;
 SET DEBUG_SYNC= 'RESET';

=== modified file 'mysql-test/suite/backup/t/backup_multi_blocks.test'
--- a/mysql-test/suite/backup/t/backup_multi_blocks.test	2009-02-13 12:40:13 +0000
+++ b/mysql-test/suite/backup/t/backup_multi_blocks.test	2009-02-24 20:57:21 +0000
@@ -41,5 +41,5 @@ CHECKSUM TABLE t1;
 
 --echo Clean-up
 DROP DATABASE mysqltest;
-let $MYSQLD_DATADIR= `SELECT @@datadir`;
-remove_file $MYSQLD_DATADIR/test.ba;
+let $MYSQLD_BACKUPDIR= `SELECT @@backupdir`;
+remove_file $MYSQLD_BACKUPDIR/test.ba;

=== modified file 'mysql-test/suite/backup/t/backup_myisam.test'
--- a/mysql-test/suite/backup/t/backup_myisam.test	2009-02-13 12:40:13 +0000
+++ b/mysql-test/suite/backup/t/backup_myisam.test	2009-02-24 20:57:21 +0000
@@ -8,11 +8,12 @@
 # Precautionary cleanup
 #
 let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR=`select @@backupdir`;
 --disable_warnings
 USE test;
 DROP DATABASE IF EXISTS mysql_db1;
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_myisam.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_myisam.bak
 --enable_warnings
 
 --echo #
@@ -45,7 +46,7 @@ SELECT COUNT(*) FROM mysql_db1.t1 WHERE 
 #
 DROP TABLE mysql_db1.t1;
 DROP DATABASE mysql_db1;
---remove_file $MYSQLD_DATADIR/bup_myisam.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_myisam.bak
 
 --echo
 --echo #
@@ -59,5 +60,5 @@ BACKUP DATABASE mysqltest TO 'bup_myisam
 DROP TABLE `äöüߣå`;
 USE test;
 DROP DATABASE mysqltest;
---remove_file $MYSQLD_DATADIR/bup_myisam.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_myisam.bak
 

=== modified file 'mysql-test/suite/backup/t/backup_myisam_coverage.test'
--- a/mysql-test/suite/backup/t/backup_myisam_coverage.test	2009-02-01 13:26:18 +0000
+++ b/mysql-test/suite/backup/t/backup_myisam_coverage.test	2009-02-24 20:57:21 +0000
@@ -9,11 +9,12 @@
 # Precautionary cleanup
 #
 let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR=`select @@backupdir`;
 --disable_warnings
 USE test;
 DROP DATABASE IF EXISTS mysql_db1;
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_myisam3.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_myisam3.bak
 --enable_warnings
 
 #
@@ -50,5 +51,5 @@ SELECT COUNT(*) FROM mysql_db1.t1 WHERE 
 SET debug='';
 DROP TABLE mysql_db1.t1;
 DROP DATABASE mysql_db1;
---remove_file $MYSQLD_DATADIR/bup_myisam3.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_myisam3.bak
 

=== modified file 'mysql-test/suite/backup/t/backup_myisam_extlocking.test'
--- a/mysql-test/suite/backup/t/backup_myisam_extlocking.test	2009-02-13 12:40:13 +0000
+++ b/mysql-test/suite/backup/t/backup_myisam_extlocking.test	2009-02-24 20:57:21 +0000
@@ -16,9 +16,9 @@ enable_query_log;
 USE test;
 DROP DATABASE IF EXISTS mysqltest;
 --enable_warnings
-let $MYSQLD_DATADIR= `SELECT @@datadir`;
+let $MYSQLD_BACKUPDIR= `SELECT @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/test.ba;
+remove_file $MYSQLD_BACKUPDIR/test.ba;
 
 CREATE DATABASE mysqltest;
 USE mysqltest;
@@ -35,5 +35,5 @@ USE test;
 DROP DATABASE mysqltest;
 # Note: The backup file should not exist as BACKUP command failed.
 --error 1
-remove_file $MYSQLD_DATADIR/test.ba;
+remove_file $MYSQLD_BACKUPDIR/test.ba;
 

=== modified file 'mysql-test/suite/backup/t/backup_myisam_sync.test'
--- a/mysql-test/suite/backup/t/backup_myisam_sync.test	2009-02-13 12:40:13 +0000
+++ b/mysql-test/suite/backup/t/backup_myisam_sync.test	2009-02-24 20:57:21 +0000
@@ -11,9 +11,9 @@
 SET DEBUG_SYNC= 'RESET';
 USE test;
 DROP DATABASE IF EXISTS mysqltest;
-let $MYSQLD_DATADIR= `SELECT @@datadir`;
+let $MYSQLD_BACKUPDIR= `SELECT @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_myisam_sync.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_myisam_sync.bak;
 --enable_warnings
 
 #
@@ -81,7 +81,7 @@ SET DEBUG_SYNC= 'now SIGNAL bup_finish';
 --echo
 --echo connection default: cleanup
 connection default;
-remove_file $MYSQLD_DATADIR/bup_myisam_sync.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_myisam_sync.bak;
 SET DEBUG_SYNC= 'RESET';
 
 #

=== modified file 'mysql-test/suite/backup/t/backup_no_be.test'
--- a/mysql-test/suite/backup/t/backup_no_be.test	2009-02-13 12:40:13 +0000
+++ b/mysql-test/suite/backup/t/backup_no_be.test	2009-02-24 20:57:21 +0000
@@ -28,10 +28,10 @@ enable_query_log;
 --disable_warnings
 DROP DATABASE IF EXISTS db1;
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 
 --error 0,1
-remove_file $MYSQLD_DATADIR/db1.bak;
+remove_file $MYSQLD_BACKUPDIR/db1.bak;
 --enable_warnings
 
 CREATE DATABASE db1;
@@ -74,7 +74,7 @@ SELECT @@debug;
 # avoid showing message codes (which change sometimes)
 
 --disable_warnings
-remove_file $MYSQLD_DATADIR/db1.bak;
+remove_file $MYSQLD_BACKUPDIR/db1.bak;
 --replace_column 1 #
 BACKUP DATABASE db1 TO 'db1.bak';
 --enable_warnings
@@ -101,4 +101,4 @@ SHOW TABLES IN db1;
 
 DROP DATABASE db1;
 SET GLOBAL debug="-d,";
---remove_file $MYSQLD_DATADIR/db1.bak
+--remove_file $MYSQLD_BACKUPDIR/db1.bak

=== modified file 'mysql-test/suite/backup/t/backup_no_data.test'
--- a/mysql-test/suite/backup/t/backup_no_data.test	2009-02-20 16:40:19 +0000
+++ b/mysql-test/suite/backup/t/backup_no_data.test	2009-02-24 20:57:21 +0000
@@ -1,26 +1,26 @@
 --source include/not_embedded.inc
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 
 --disable_warnings
---rmdir $MYSQLD_DATADIR/test
---mkdir $MYSQLD_DATADIR/test
+--rmdir $MYSQLD_BACKUPDIR/test
+--mkdir $MYSQLD_BACKUPDIR/test
 DROP DATABASE IF EXISTS empty_db;
 DROP DATABASE IF EXISTS other_db;
 --enable_warnings
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 
 CREATE DATABASE empty_db;
 CREATE DATABASE other_db;
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/empty_db.bak
+--remove_file $MYSQLD_BACKUPDIR/empty_db.bak
 --replace_column 1 #
 BACKUP DATABASE empty_db TO 'empty_db.bak';
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/all.bak
+--remove_file $MYSQLD_BACKUPDIR/all.bak
 --replace_column 1 #
 BACKUP DATABASE * TO 'all.bak';
 
@@ -61,7 +61,7 @@ CREATE TABLE t1 (
 ) DEFAULT CHARSET=latin1;
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/empty_db.bak
+--remove_file $MYSQLD_BACKUPDIR/empty_db.bak
 --replace_column 1 #
 BACKUP DATABASE empty_db TO 'empty_db.bak';
 
@@ -87,12 +87,12 @@ DROP DATABASE IF EXISTS other_db;
 # we remove the test/db.opt file as a part of clean-up.
 #
 --error 0,1
---remove_file $MYSQLD_DATADIR/test/db.opt
+--remove_file $MYSQLD_BACKUPDIR/test/db.opt
 --enable_warnings
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/all.bak
+--remove_file $MYSQLD_BACKUPDIR/all.bak
 --error 0,1
---remove_file $MYSQLD_DATADIR/empty_db.bak
+--remove_file $MYSQLD_BACKUPDIR/empty_db.bak
 
 

=== modified file 'mysql-test/suite/backup/t/backup_no_engine.test'
--- a/mysql-test/suite/backup/t/backup_no_engine.test	2009-02-13 12:40:13 +0000
+++ b/mysql-test/suite/backup/t/backup_no_engine.test	2009-02-24 20:57:21 +0000
@@ -7,7 +7,7 @@
 --let $table_def=$MYSQL_TEST_DIR/std_data/bug30938.frm
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
-
+let $MYSQLD_BACKUPDIR= `SELECT @@backupdir`;
 --disable_warnings
 DROP DATABASE IF EXISTS db;
 --enable_warnings
@@ -37,4 +37,4 @@ SHOW CREATE TABLE db.t1;	
 
 # clean up
 DROP DATABASE db;
-remove_file $MYSQLD_DATADIR/db.backup;
+remove_file $MYSQLD_BACKUPDIR/db.backup;

=== modified file 'mysql-test/suite/backup/t/backup_nodata_driver.test'
--- a/mysql-test/suite/backup/t/backup_nodata_driver.test	2008-12-15 12:41:31 +0000
+++ b/mysql-test/suite/backup/t/backup_nodata_driver.test	2009-02-24 20:57:21 +0000
@@ -29,11 +29,11 @@ INSTALL PLUGIN example SONAME 'ha_exampl
 DROP DATABASE IF EXISTS bup_nodata;
 DROP DATABASE IF EXISTS bup_data;
 
-let $MYSQLD_DATADIR= `SELECT @@datadir`;
+let $MYSQLD_BACKUPDIR= `SELECT @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_data.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_data.bak;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_nodata.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_nodata.bak;
 --enable_warnings
 
 --echo #
@@ -244,8 +244,8 @@ SELECT * FROM bup_nodata.e1;
 --echo #
 DROP DATABASE bup_nodata;
 
-remove_file $MYSQLD_DATADIR/bup_data.bak;
-remove_file $MYSQLD_DATADIR/bup_nodata.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_data.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_nodata.bak;
 
 UNINSTALL PLUGIN example;
 

=== modified file 'mysql-test/suite/backup/t/backup_objects.test'
--- a/mysql-test/suite/backup/t/backup_objects.test	2009-02-13 12:40:13 +0000
+++ b/mysql-test/suite/backup/t/backup_objects.test	2009-02-24 20:57:21 +0000
@@ -38,10 +38,10 @@
 --echo 
 ##############################################################
 
-let $MYSQLD_DATADIR=`select @@datadir`;
+let $MYSQLD_BACKUPDIR=`select @@backupdir`;
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_objects.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_objects.bak
 
 # Set SQL_MODE and client charset
 --echo Setting SQL_MODE = PIPES_AS_CONCAT
@@ -217,4 +217,4 @@ SELECT * FROM db2.v22;
 --echo Cleanup
 DROP DATABASE db1;
 DROP DATABASE db2;
---remove_file $MYSQLD_DATADIR/bup_objects.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_objects.bak

=== modified file 'mysql-test/suite/backup/t/backup_procedures.test'
--- a/mysql-test/suite/backup/t/backup_procedures.test	2008-10-29 08:45:14 +0000
+++ b/mysql-test/suite/backup/t/backup_procedures.test	2009-02-24 20:57:21 +0000
@@ -9,9 +9,9 @@
 --echo Starting regression test for 34868 - Backup: restore failure if two procedures
 
 
-let $MYSQLD_DATADIR= `SELECT @@datadir`;
+let $MYSQLD_BACKUPDIR= `SELECT @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_proc.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_proc.bak;
 
 --echo
 --echo Create database and procedures
@@ -54,4 +54,4 @@ SELECT @a;
 --echo Cleaning up
 
 DROP DATABASE bup_proc;
-remove_file $MYSQLD_DATADIR/bup_proc.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_proc.bak;

=== modified file 'mysql-test/suite/backup/t/backup_security.test'
--- a/mysql-test/suite/backup/t/backup_security.test	2008-12-06 00:24:23 +0000
+++ b/mysql-test/suite/backup/t/backup_security.test	2009-02-24 20:57:21 +0000
@@ -97,7 +97,7 @@ DROP USER bup_no_rights;
 DROP USER bup_with_rights;
 DROP DATABASE backup_test;
 
-let $MYSQLD_DATADIR= `select @@datadir`;
-remove_file $MYSQLD_DATADIR/bup_with_rights.bak;
-remove_file $MYSQLD_DATADIR/backup_test_orig.bak;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
+remove_file $MYSQLD_BACKUPDIR/bup_with_rights.bak;
+remove_file $MYSQLD_BACKUPDIR/backup_test_orig.bak;
 

=== modified file 'mysql-test/suite/backup/t/backup_snapshot.test'
--- a/mysql-test/suite/backup/t/backup_snapshot.test	2008-12-06 00:24:23 +0000
+++ b/mysql-test/suite/backup/t/backup_snapshot.test	2009-02-24 20:57:21 +0000
@@ -29,9 +29,9 @@
 SET DEBUG_SYNC= 'reset';
 DROP DATABASE IF EXISTS bup_snapshot;
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_snapshot.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_snapshot.bak;
 --enable_warnings
 
 --echo #
@@ -125,7 +125,7 @@ SELECT * FROM bup_snapshot.t1 WHERE word
 SELECT COUNT(*) FROM bup_snapshot.t1;
 SELECT COUNT(*) FROM bup_snapshot.t2;
 
-remove_file $MYSQLD_DATADIR/bup_snapshot.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_snapshot.bak;
 
 --echo #
 --echo # Test 2: Check for consistent read after open and lock tables
@@ -189,5 +189,5 @@ SELECT COUNT(*) FROM bup_snapshot.t2;
 #
 SET DEBUG_SYNC= 'reset';
 DROP DATABASE bup_snapshot;
-remove_file $MYSQLD_DATADIR/bup_snapshot.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_snapshot.bak;
 

=== modified file 'mysql-test/suite/backup/t/backup_tablespace.test'
--- a/mysql-test/suite/backup/t/backup_tablespace.test	2008-11-12 15:23:22 +0000
+++ b/mysql-test/suite/backup/t/backup_tablespace.test	2009-02-24 20:57:21 +0000
@@ -10,7 +10,7 @@
 
 call mtr.add_suppression("Restore: Tablespace .* needed by tables being restored, but the current tablespace definition differs");
 
-let $MYSQLD_DATADIR=`select @@datadir`;
+let $MYSQLD_BACKUPDIR=`select @@backupdir`;
 
 --disable_warnings
 #
@@ -23,7 +23,7 @@ DROP TABLE IF EXISTS backup_ts.not_ts;
 DROP TABLE IF EXISTS backup_ts.has_ts;
 DROP DATABASE IF EXISTS backup_ts;
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup_ts.bak;
+--remove_file $MYSQLD_BACKUPDIR/backup_ts.bak;
 --enable_warnings
 
 CREATE DATABASE backup_ts;
@@ -95,5 +95,5 @@ DROP DATABASE IF EXISTS backup_ts;
 DROP TABLESPACE bup_ts ENGINE=FALCON;
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/backup_ts.bak
+--remove_file $MYSQLD_BACKUPDIR/backup_ts.bak
 

=== modified file 'mysql-test/suite/backup/t/backup_timeout.test'
--- a/mysql-test/suite/backup/t/backup_timeout.test	2009-02-13 13:25:43 +0000
+++ b/mysql-test/suite/backup/t/backup_timeout.test	2009-02-24 20:57:21 +0000
@@ -7,7 +7,7 @@
 --source include/not_embedded.inc
 --source include/have_debug_sync.inc
 
-let MYSQLD_DATADIR= `select @@datadir`;
+let MYSQLD_BACKUPDIR= `select @@backupdir`;
 
 SET DEBUG_SYNC= 'reset';
 
@@ -16,7 +16,7 @@ SET DEBUG_SYNC= 'reset';
 #
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/bup_blocker.bak;
+--remove_file $MYSQLD_BACKUPDIR/bup_blocker.bak;
 
 #
 # Connections used in this test
@@ -58,7 +58,7 @@ SHOW VARIABLES LIKE 'backup_wait%';
 --echo Part A
 
 --error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/bup_bml.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_bml.bak
 
 connection con1;
 
@@ -98,7 +98,7 @@ reap;
 --echo Part B
 
 --error 0,1
---remove_file $MYSQLD_DATADIR/bup_bml.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_bml.bak
 
 connection con1;
 
@@ -163,4 +163,4 @@ DROP DATABASE bup_bml;
 
 SET DEBUG_SYNC= 'reset';
 
---remove_file $MYSQLD_DATADIR/bup_bml.bak
+--remove_file $MYSQLD_BACKUPDIR/bup_bml.bak

=== modified file 'mysql-test/suite/backup/t/backup_triggers_and_events.test'
--- a/mysql-test/suite/backup/t/backup_triggers_and_events.test	2008-10-24 08:11:18 +0000
+++ b/mysql-test/suite/backup/t/backup_triggers_and_events.test	2009-02-24 20:57:21 +0000
@@ -5,10 +5,10 @@
 # RESTORE operation.
 #
 # Author: Rafal Somla
-
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 --disable_warnings
 --error 0,1
-remove_file $MYSQL_TEST_DIR/var/master-data/db.bak;
+remove_file $MYSQLD_BACKUPDIR/db.bak;
 --enable_warnings
 
 SET GLOBAL event_scheduler=off;
@@ -213,4 +213,4 @@ DROP TRIGGER test.trg;
 DROP TABLE test.logt;
 DROP TABLE test.t1;
 DROP DATABASE db;
-remove_file $MYSQL_TEST_DIR/var/master-data/db.bak;
+remove_file $MYSQLD_BACKUPDIR/db.bak;

=== modified file 'mysql-test/suite/backup/t/backup_views.test'
--- a/mysql-test/suite/backup/t/backup_views.test	2009-02-12 06:42:25 +0000
+++ b/mysql-test/suite/backup/t/backup_views.test	2009-02-24 20:57:21 +0000
@@ -23,9 +23,9 @@ enable_query_log;
 ##############################################################
 
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_objectview.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_objectview.bak;
 
 #Create Database and object view for this test.
 
@@ -382,7 +382,7 @@ DROP TABLE bup_db2.t2;
 DROP DATABASE bup_db1;
 DROP DATABASE bup_db2;
 
-remove_file $MYSQLD_DATADIR/bup_objectview.bak;
-remove_file $MYSQLD_DATADIR/bup_objectview1.bak;
-remove_file $MYSQLD_DATADIR/bup_objectview2.bak;
-remove_file $MYSQLD_DATADIR/bup_objectview3.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_objectview.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_objectview1.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_objectview2.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_objectview3.bak;

=== modified file 'mysql-test/suite/backup_engines/t/backup_functions.test'
--- a/mysql-test/suite/backup_engines/t/backup_functions.test	2008-10-29 08:45:14 +0000
+++ b/mysql-test/suite/backup_engines/t/backup_functions.test	2009-02-24 20:57:21 +0000
@@ -17,9 +17,9 @@ connect (breakpoints,localhost,root,,);
 --echo
 ##############################################################
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_sfs.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_sfs.bak;
 
 #Create Database and object stored function for this test.
 
@@ -270,4 +270,4 @@ SELECT paymentno,amount, dollars(amount)
 
 DROP DATABASE bup_sfs;
 
-remove_file $MYSQLD_DATADIR/bup_sfs.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_sfs.bak;

=== modified file 'mysql-test/suite/backup_engines/t/backup_online_testing.test'
--- a/mysql-test/suite/backup_engines/t/backup_online_testing.test	2008-12-06 00:24:23 +0000
+++ b/mysql-test/suite/backup_engines/t/backup_online_testing.test	2009-02-24 20:57:21 +0000
@@ -49,11 +49,11 @@ SET DEBUG_SYNC= 'RESET';
 DROP DATABASE IF EXISTS bup_online;
 --enable_warnings
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_online.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_online.bak;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_online1.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_online1.bak;
 
 ##############################################################
 --echo
@@ -221,7 +221,7 @@ SELECT COUNT(*) FROM t1;
 SELECT * FROM t2;
 SELECT  COUNT(*) FROM t2;
 
-remove_file $MYSQLD_DATADIR/bup_online.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_online.bak;
 
 
 --echo
@@ -331,7 +331,7 @@ SELECT  COUNT(*) FROM t2;
 SELECT *FROM t3;
 SELECT  COUNT(*) FROM t3;
 
-remove_file $MYSQLD_DATADIR/bup_online1.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_online1.bak;
 
 
 --echo
@@ -441,7 +441,7 @@ SELECT  COUNT(*) FROM t2;
 SELECT *FROM t3;
 SELECT  COUNT(*) FROM t3;
 
-remove_file $MYSQLD_DATADIR/bup_online.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_online.bak;
 
 
 --echo
@@ -551,7 +551,7 @@ SELECT  COUNT(*) FROM t2;
 SELECT *FROM t3;
 SELECT  COUNT(*) FROM t3;
 
-remove_file $MYSQLD_DATADIR/bup_online.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_online.bak;
 
 
 --echo
@@ -661,7 +661,7 @@ SELECT  COUNT(*) FROM t2;
 SELECT *FROM t3;
 SELECT  COUNT(*) FROM t3;
 
-remove_file $MYSQLD_DATADIR/bup_online.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_online.bak;
 
 
 --echo
@@ -793,7 +793,7 @@ SELECT  COUNT(*) FROM t2;
 SELECT *FROM t3;
 SELECT  COUNT(*) FROM t3;
 
-remove_file $MYSQLD_DATADIR/bup_online.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_online.bak;
 
 
 --echo
@@ -926,7 +926,7 @@ SELECT *FROM t3;
 SELECT  COUNT(*) FROM t3;
 
 
-remove_file $MYSQLD_DATADIR/bup_online.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_online.bak;
 
 
 --echo
@@ -1036,7 +1036,7 @@ SELECT  COUNT(*) FROM t2;
 SELECT *FROM t3;
 SELECT  COUNT(*) FROM t3;
 
-remove_file $MYSQLD_DATADIR/bup_online.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_online.bak;
 
 
 --echo
@@ -1154,6 +1154,6 @@ SELECT  COUNT(*) FROM t3;
 
 DROP DATABASE bup_online;
 
-remove_file $MYSQLD_DATADIR/bup_online.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_online.bak;
 
 SET DEBUG_SYNC= 'RESET';

=== modified file 'mysql-test/suite/backup_engines/t/backup_procedures.test'
--- a/mysql-test/suite/backup_engines/t/backup_procedures.test	2008-10-29 08:45:14 +0000
+++ b/mysql-test/suite/backup_engines/t/backup_procedures.test	2009-02-24 20:57:21 +0000
@@ -17,9 +17,9 @@ connect (breakpoints,localhost,root,,);
 --echo
 ##############################################################
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_sp.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_sp.bak;
 
 # Multiple instances of stored routines without atleast one table in
 # database results in failure.
@@ -121,4 +121,4 @@ SELECT @x;
 
 DROP DATABASE bup_sp;
 
-remove_file $MYSQLD_DATADIR/bup_sp.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_sp.bak;

=== modified file 'mysql-test/suite/backup_engines/t/backup_triggers.test'
--- a/mysql-test/suite/backup_engines/t/backup_triggers.test	2008-10-29 08:45:14 +0000
+++ b/mysql-test/suite/backup_engines/t/backup_triggers.test	2009-02-24 20:57:21 +0000
@@ -19,9 +19,9 @@ connect (breakpoints,localhost,root,,);
 --echo
 ##############################################################
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+let $MYSQLD_BACKUPDIR= `select @@backupdir`;
 --error 0,1
-remove_file $MYSQLD_DATADIR/bup_ts.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_ts.bak;
 
 --error 0,1
 --disable_warnings
@@ -294,6 +294,6 @@ SELECT * FROM bup_ts.t4;
 
 DROP DATABASE bup_ts;
 
-remove_file $MYSQLD_DATADIR/bup_ts.bak;
+remove_file $MYSQLD_BACKUPDIR/bup_ts.bak;
 
 

Thread
bzr commit into mysql-6.0 branch (hema:2781) Bug#40849Hema Sridharan24 Feb