#At file:///ext/mysql/bzr/backup/bug45877/ based on revid:charles.bell@stripped
2890 Rafal Somla 2009-11-13
Bug #45877 Implementation of backup_external_non_win does not work
Before: Tests backup_external_non_win* would fail if the mysql_convert_table_format
utility could not be found in the tree.
After: These tests will be skipped in such case.
@ mysql-test/collections/default.experimental
Remove tests from experimental list.
@ mysql-test/suite/backup/include/backup_ext.inc
Source temporary file to set $MYSQL_CONVERT_TABLE_FORMAT variable, so that it
does not have to be done by script including this file.
@ mysql-test/suite/backup/t/backup_external_non_win.test
- Skip test if the mysql_convert_table_format utility could not be found.
- No need to source temporary file - variable MYSQL_CONVERT_TABLE_FORMAT
is set in backup_ext.inc file.
@ mysql-test/suite/backup/t/backup_external_non_win_not_falcon.test
- Skip test if the mysql_convert_table_format utility could not be found.
- No need to source temporary file - variable MYSQL_CONVERT_TABLE_FORMAT
is set in backup_ext.inc file.
modified:
mysql-test/collections/default.experimental
mysql-test/suite/backup/include/backup_ext.inc
mysql-test/suite/backup/t/backup_external_non_win.test
mysql-test/suite/backup/t/backup_external_non_win_not_falcon.test
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental 2009-11-10 17:24:18 +0000
+++ b/mysql-test/collections/default.experimental 2009-11-13 12:10:39 +0000
@@ -3,7 +3,6 @@
backup.backup_dbname_lctn2 @windows @darwin # Bug#46933 2009-08-26 alik backup_*_lctn2 tests fail on windows
backup.backup_events # Bug#47211 2009-09-25 alik backup_events.test fails randomly
-backup.backup_external_non_win* # BUG#45877
backup.backup_xpfm_compat_backup_lctn2 @windows # Bug#46933 2009-08-26 alik backup_*_lctn2 tests fail on windows
binlog.binlog_multi_engine # joro : NDB tests marked as experimental as agreed with bochklin
=== modified file 'mysql-test/suite/backup/include/backup_ext.inc'
--- a/mysql-test/suite/backup/include/backup_ext.inc 2009-03-25 22:17:35 +0000
+++ b/mysql-test/suite/backup/include/backup_ext.inc 2009-11-13 12:10:39 +0000
@@ -28,3 +28,6 @@ my $F = IO::File->new("$vardir/tmp/mctf.
print $F "let \$MYSQL_CONVERT_TABLE_FORMAT = $location;";
EOF
+
+--source $MYSQLTEST_VARDIR/tmp/mctf.inc
+
=== modified file 'mysql-test/suite/backup/t/backup_external_non_win.test'
--- a/mysql-test/suite/backup/t/backup_external_non_win.test 2009-06-13 10:12:02 +0000
+++ b/mysql-test/suite/backup/t/backup_external_non_win.test 2009-11-13 12:10:39 +0000
@@ -12,6 +12,11 @@
--source suite/backup/include/backup_ext.inc
--source suite/backup/include/have_dbi.inc
+if(`select "$MYSQL_CONVERT_TABLE_FORMAT" NOT LIKE '%convert_table_format%'`)
+{
+--skip Could not find mysql_convert_table_format utility.
+}
+
let $MYSQLD_BACKUPDIR = `select @@backupdir`;
let $MYSQLD_DATADIR= `select @@datadir`;
@@ -75,7 +80,6 @@ INSERT INTO db2.t1(b,c) VALUES
# Changing the storage engine for db1
SHOW CREATE TABLE db1.t1;
-source $MYSQLTEST_VARDIR/tmp/mctf.inc;
--exec perl $MYSQL_CONVERT_TABLE_FORMAT --user=root -S $MASTER_MYSOCK --port=$MASTER_MYPORT --type=innodb db1
--echo
@@ -96,7 +100,6 @@ RESTORE FROM 'db1.bak';
SHOW CREATE TABLE db1.t1;
--echo # Changing the storage engine back to myisam
-source $MYSQLTEST_VARDIR/tmp/mctf.inc;
--exec perl $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT db1
SHOW CREATE TABLE db1.t1;
@@ -156,7 +159,6 @@ BACKUP DATABASE db1 TO 'db1.bak';
--echo # tables in db1
--disable_warnings
-source $MYSQLTEST_VARDIR/tmp/mctf.inc;
--exec perl $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT --type=myisam db1
--enable_warnings
@@ -191,7 +193,6 @@ RESTORE FROM 'db1.bak' OVERWRITE;
--echo # Verify that tablespace is restored from db1.t2
SHOW CREATE TABLE db1.t2;
-source $MYSQLTEST_VARDIR/tmp/mctf.inc;
--exec perl $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT --type=falcon db1
SHOW CREATE TABLE db1.tpl;
@@ -224,7 +225,6 @@ DROP VIEW db2.v1;
--remove_file $MYSQLD_BACKUPDIR/db1.bak
--echo # Changing the storage engine back to myisam after restore
-source $MYSQLTEST_VARDIR/tmp/mctf.inc;
--exec perl $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT db1
SHOW CREATE TABLE db1.t1;
=== modified file 'mysql-test/suite/backup/t/backup_external_non_win_not_falcon.test'
--- a/mysql-test/suite/backup/t/backup_external_non_win_not_falcon.test 2009-06-30 07:51:04 +0000
+++ b/mysql-test/suite/backup/t/backup_external_non_win_not_falcon.test 2009-11-13 12:10:39 +0000
@@ -9,6 +9,11 @@
--source suite/backup/include/backup_ext.inc
--source suite/backup/include/have_dbi.inc
+if(`select "$MYSQL_CONVERT_TABLE_FORMAT" NOT LIKE '%convert_table_format%'`)
+{
+--skip Could not find mysql_convert_table_format utility.
+}
+
let $MYSQLD_BACKUPDIR = `select @@backupdir`;
let $MYSQLD_DATADIR= `select @@datadir`;
@@ -69,7 +74,6 @@ INSERT INTO db2.t1(b,c) VALUES
# Changing the storage engine for db1
SHOW CREATE TABLE db1.t1;
-source $MYSQLTEST_VARDIR/tmp/mctf.inc;
--exec $MYSQL_CONVERT_TABLE_FORMAT --user=root -S $MASTER_MYSOCK --port=$MASTER_MYPORT --type=innodb db1
--echo
@@ -90,7 +94,6 @@ RESTORE FROM 'db1.bak';
SHOW CREATE TABLE db1.t1;
--echo # Changing the storage engine back to myisam
-source $MYSQLTEST_VARDIR/tmp/mctf.inc;
--exec $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT db1
SHOW CREATE TABLE db1.t1;
@@ -149,7 +152,6 @@ BACKUP DATABASE db1 TO 'db1.bak';
--echo # tables in db1
--disable_warnings
-source $MYSQLTEST_VARDIR/tmp/mctf.inc;
--exec $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT --type=myisam db1
--enable_warnings
@@ -182,7 +184,6 @@ RESTORE FROM 'db1.bak' OVERWRITE;
SHOW CREATE TABLE db1.t2;
-source $MYSQLTEST_VARDIR/tmp/mctf.inc;
--exec $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT --type=innodb db1
SHOW CREATE TABLE db1.tpl;
@@ -215,7 +216,6 @@ DROP VIEW db2.v1;
--remove_file $MYSQLD_BACKUPDIR/db1.bak
--echo # Changing the storage engine back to myisam after restore
-source $MYSQLTEST_VARDIR/tmp/mctf.inc;
--exec $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT db1
SHOW CREATE TABLE db1.t1;
Attachment: [text/bzr-bundle] bzr/rafal.somla@sun.com-20091113121039-6vf0iybzrwvag4v8.bundle
