Approved. /L
On Fri, Nov 13, 2009 at 12:10:47PM +0000, Rafal Somla wrote:
> #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;
>
> # Bazaar merge directive format 2 (Bazaar 0.90)
> # revision_id: rafal.somla@stripped
> # target_branch: file:///ext/mysql/bzr/backup/bug45877/
> # testament_sha1: 3f000533f73f6c419855be3fe3c064f941647bf6
> # timestamp: 2009-11-13 13:10:49 +0100
> # base_revision_id: charles.bell@stripped\
> # t31kaagb5yoc9e68
> #
> # Begin bundle
> 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
>
>
>
> --
> MySQL Code Commits Mailing List
> For list archives: http://lists.mysql.com/commits
> To unsubscribe: http://lists.mysql.com/commits?unsub=1
--
Dr Lars Thalmann, Development Manager, Replication & Backup, www.mysql.com
