2825 Sergey Petrunia 2009-02-01
Fix PB failures: Update tests to work with MTR2. The test update is probably incomplete
modified:
mysql-test/suite/backup/r/backup_datatypes.result
mysql-test/suite/backup/r/backup_errors.result
mysql-test/suite/backup/t/backup.test
mysql-test/suite/backup/t/backup_datatypes.test
mysql-test/suite/backup/t/backup_errors.test
mysql-test/suite/backup/t/backup_logs.test
mysql-test/suite/backup/t/backup_myisam_coverage.test
2824 Sergey Petrunia 2009-01-30
Post-merge adaptations to new MTR: s|MYSQLTEST_VARDIR/master-data/|MYSQLD_DATADIR/|g
modified:
mysql-test/suite/backup/t/backup_myisam.test
=== modified file 'mysql-test/suite/backup/r/backup_datatypes.result'
--- a/mysql-test/suite/backup/r/backup_datatypes.result 2008-12-18 21:09:11 +0000
+++ b/mysql-test/suite/backup/r/backup_datatypes.result 2009-02-01 13:26:18 +0000
@@ -120,6 +120,7 @@ SHOW DATABASES;
Database
information_schema
����
+mtr
mysql
test
** checking the character set **
@@ -211,6 +212,7 @@ SHOW DATABASES;
Database
information_schema
��
+mtr
mysql
test
** checking client character set **
=== modified file 'mysql-test/suite/backup/r/backup_errors.result'
--- a/mysql-test/suite/backup/r/backup_errors.result 2009-01-29 21:17:59 +0000
+++ b/mysql-test/suite/backup/r/backup_errors.result 2009-02-01 13:26:18 +0000
@@ -2,7 +2,7 @@ DROP DATABASE IF EXISTS adb;
DROP DATABASE IF EXISTS bdb;
# non-existent backup archive
RESTORE FROM 'test.bak';
-ERROR HY000: File 'MYSQLTEST_VARDIR/master-data/test.bak' not found (Errcode: #)
+ERROR HY000: File 'MYSQLTEST_VARDIR/mysqld.1/data/test.bak' not found (Errcode: #)
Get last backup_id
SELECT MAX(backup_id) INTO @bup_id FROM mysql.backup_history
WHERE command LIKE "RESTORE FROM 'test%";
@@ -45,10 +45,10 @@ Malformed file path ''
error
# don't overwrite existing files
BACKUP DATABASE adb TO "bdb/t1.frm";
-ERROR HY000: Can't create/write to file 'MYSQLTEST_VARDIR/master-data/bdb/t1.frm' (Errcode: #)
+ERROR HY000: Can't create/write to file 'MYSQLTEST_VARDIR/mysqld.1/data/bdb/t1.frm' (Errcode: #)
SHOW WARNINGS;
Level Code Message
-Error # Can't create/write to file 'MYSQLTEST_VARDIR/master-data/bdb/t1.frm' (Errcode: #)
+Error # Can't create/write to file 'MYSQLTEST_VARDIR/mysqld.1/data/bdb/t1.frm' (Errcode: #)
Error # Can't write to backup location 'bdb/t1.frm'
Warning # Operation aborted
BACKUP DATABASE adb TO "test.bak";
@@ -58,10 +58,10 @@ SHOW WARNINGS;
Level Code Message
# don't overwrite existing backup image
BACKUP DATABASE adb TO "test.bak";
-ERROR HY000: Can't create/write to file 'MYSQLTEST_VARDIR/master-data/test.bak' (Errcode: #)
+ERROR HY000: Can't create/write to file 'MYSQLTEST_VARDIR/mysqld.1/data/test.bak' (Errcode: #)
SHOW WARNINGS;
Level Code Message
-Error # Can't create/write to file 'MYSQLTEST_VARDIR/master-data/test.bak' (Errcode: #)
+Error # Can't create/write to file 'MYSQLTEST_VARDIR/mysqld.1/data/test.bak' (Errcode: #)
Error # Can't write to backup location 'test.bak'
Warning # Operation aborted
Get last backup_id
@@ -409,10 +409,10 @@ backup_id
#
# Generate warning - test.bak cannot be overwritten
BACKUP DATABASE db1 TO 'test.bak';
-ERROR HY000: Can't create/write to file 'MYSQLTEST_VARDIR/master-data/test.bak' (Errcode: #)
+ERROR HY000: Can't create/write to file 'MYSQLTEST_VARDIR/mysqld.1/data/test.bak' (Errcode: #)
SHOW WARNINGS;
Level Code Message
-Error # Can't create/write to file 'MYSQLTEST_VARDIR/master-data/test.bak' (Errcode: #)
+Error # Can't create/write to file 'MYSQLTEST_VARDIR/mysqld.1/data/test.bak' (Errcode: #)
Error # Can't write to backup location 'test.bak'
Warning # Operation aborted
@@ -425,10 +425,10 @@ Level Code Message
# Generate warning - test.bak cannot be overwritten
BACKUP DATABASE db1 TO 'test.bak';
-ERROR HY000: Can't create/write to file 'MYSQLTEST_VARDIR/master-data/test.bak' (Errcode: #)
+ERROR HY000: Can't create/write to file 'MYSQLTEST_VARDIR/mysqld.1/data/test.bak' (Errcode: #)
SHOW WARNINGS;
Level Code Message
-Error # Can't create/write to file 'MYSQLTEST_VARDIR/master-data/test.bak' (Errcode: #)
+Error # Can't create/write to file 'MYSQLTEST_VARDIR/mysqld.1/data/test.bak' (Errcode: #)
Error # Can't write to backup location 'test.bak'
Warning # Operation aborted
=== modified file 'mysql-test/suite/backup/t/backup.test'
--- a/mysql-test/suite/backup/t/backup.test 2008-12-24 10:48:24 +0000
+++ b/mysql-test/suite/backup/t/backup.test 2009-02-01 13:26:18 +0000
@@ -236,7 +236,7 @@ FROM mysql.backup_history
WHERE backup_id = @bid;
DROP DATABASE db1;
---remove_file $MYSQLTEST_VARDIR/master-data/db1.bkp
+--remove_file $MYSQLD_DATADIR/db1.bkp
#
=== modified file 'mysql-test/suite/backup/t/backup_datatypes.test'
--- a/mysql-test/suite/backup/t/backup_datatypes.test 2008-12-18 21:09:11 +0000
+++ b/mysql-test/suite/backup/t/backup_datatypes.test 2009-02-01 13:26:18 +0000
@@ -17,9 +17,10 @@ connect (breakpoints,localhost,root,,);
--echo starting the test for backup
--echo
##############################################################
+let $MYSQLD_DATADIR= `select @@datadir`;
--error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/bup_datatype.bak
+--remove_file $MYSQLD_DATADIR/bup_datatype.bak
#Create Database and tables with different datatypes for this test.
@@ -139,5 +140,5 @@ SET NAMES utf8;
DROP DATABASE `����`;
---remove_file $MYSQLTEST_VARDIR/master-data/bup_datatype.bak
+--remove_file $MYSQLD_DATADIR/bup_datatype.bak
=== modified file 'mysql-test/suite/backup/t/backup_errors.test'
--- a/mysql-test/suite/backup/t/backup_errors.test 2009-01-29 21:17:59 +0000
+++ b/mysql-test/suite/backup/t/backup_errors.test 2009-02-01 13:26:18 +0000
@@ -550,8 +550,8 @@ RESTORE FROM 'newtest.bak' OVERWRITE;
--replace_column 2 #
SHOW WARNINGS;
---remove_file $MYSQLTEST_VARDIR/master-data/test.bak
---remove_file $MYSQLTEST_VARDIR/master-data/newtest.bak
+--remove_file $MYSQLD_DATADIR/test.bak
+--remove_file $MYSQLD_DATADIR/newtest.bak
--echo
DROP DATABASE db1;
=== modified file 'mysql-test/suite/backup/t/backup_logs.test'
--- a/mysql-test/suite/backup/t/backup_logs.test 2009-01-29 21:17:59 +0000
+++ b/mysql-test/suite/backup/t/backup_logs.test 2009-02-01 13:26:18 +0000
@@ -94,7 +94,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 $MYSQLTEST_VARDIR/master-data/backup_logs1.bak
+--remove_file $MYSQLD_DATADIR/backup_logs1.bak
#
# Test 2 - Check output of backup and verify different columns in
@@ -128,7 +128,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 $MYSQLTEST_VARDIR/master-data/backup_logs1.bak
+--remove_file $MYSQLD_DATADIR/backup_logs1.bak
connection con3;
SELECT CURRENT_USER();
@@ -141,7 +141,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 $MYSQLTEST_VARDIR/master-data/backup_logs1.bak
+--remove_file $MYSQLD_DATADIR/backup_logs1.bak
--echo
--echo From the above tables we can notice that num_objects shows '0' if only DB
@@ -366,11 +366,11 @@ EOF
--echo because of bug#37980. Once this bug is fixed, both should show
--echo same bytes.
---file_exists $MYSQLTEST_VARDIR/master-data/backup_history.log
---file_exists $MYSQLTEST_VARDIR/master-data/backup_progress.log
+--file_exists $MYSQLD_DATADIR/backup_history.log
+--file_exists $MYSQLD_DATADIR/backup_progress.log
-#cat_file $MYSQLTEST_VARDIR/master-data/backup_history.log;
-#cat_file $MYSQLTEST_VARDIR/master-data/backup_progress.log;
+#cat_file $MYSQLD_DATADIR/backup_history.log;
+#cat_file $MYSQLD_DATADIR/backup_progress.log;
connection con2;
@@ -433,10 +433,10 @@ SELECT timediff(now(),@start_restore) >
--replace_column 1 # 3 # 4 #
SELECT * FROM mysql.backup_progress WHERE backup_id = 501;
---file_exists $MYSQLTEST_VARDIR/master-data/backup_history.log
---file_exists $MYSQLTEST_VARDIR/master-data/backup_progress.log
-#cat_file $MYSQLTEST_VARDIR/master-data/backup_history.log;
-#cat_file $MYSQLTEST_VARDIR/master-data/backup_progress.log;
+--file_exists $MYSQLD_DATADIR/backup_history.log
+--file_exists $MYSQLD_DATADIR/backup_progress.log
+#cat_file $MYSQLD_DATADIR/backup_history.log;
+#cat_file $MYSQLD_DATADIR/backup_progress.log;
SET DEBUG_SYNC= 'RESET';
=== modified file 'mysql-test/suite/backup/t/backup_myisam_coverage.test'
--- a/mysql-test/suite/backup/t/backup_myisam_coverage.test 2008-12-30 12:13:31 +0000
+++ b/mysql-test/suite/backup/t/backup_myisam_coverage.test 2009-02-01 13:26:18 +0000
@@ -8,11 +8,12 @@
#
# Precautionary cleanup
#
+let $MYSQLD_DATADIR= `select @@datadir`;
--disable_warnings
USE test;
DROP DATABASE IF EXISTS mysql_db1;
--error 0,1
---remove_file $MYSQLTEST_VARDIR/master-data/bup_myisam3.bak
+--remove_file $MYSQLD_DATADIR/bup_myisam3.bak
--enable_warnings
#
@@ -31,8 +32,8 @@ INSERT INTO mysql_db1.t1 SELECT * FROM m
INSERT INTO mysql_db1.t1 SELECT * FROM mysql_db1.t1;
FLUSH TABLE mysql_db1.t1;
#
---exec $MYISAMPACK -s $MYSQLTEST_VARDIR/master-data/mysql_db1/t1
---exec $MYISAMCHK -srq $MYSQLTEST_VARDIR/master-data/mysql_db1/t1
+--exec $MYISAMPACK -s $MYSQLD_DATADIR/mysql_db1/t1
+--exec $MYISAMCHK -srq $MYSQLD_DATADIR/mysql_db1/t1
#
--replace_column 1 #
BACKUP DATABASE mysql_db1 to 'bup_myisam3.bak';
@@ -49,5 +50,5 @@ SELECT COUNT(*) FROM mysql_db1.t1 WHERE
SET debug='';
DROP TABLE mysql_db1.t1;
DROP DATABASE mysql_db1;
---remove_file $MYSQLTEST_VARDIR/master-data/bup_myisam3.bak
+--remove_file $MYSQLD_DATADIR/bup_myisam3.bak
| Thread |
|---|
| • bzr push into mysql-6.0-opt branch (sergefp:2824 to 2825) | Sergey Petrunia | 1 Feb |
