Approved.
Jorgen Loland wrote:
> #At file:///localhome/jl208045/mysql/mysql-6.0-backup-empty/
>
> 2741 Jorgen Loland 2008-11-20
> Bug#40878 - Backup: main.implicit_commit fails in pushbuild
>
> Add 'OVERWRITE' flag to RESTORE
> modified:
> mysql-test/r/implicit_commit.result
> mysql-test/t/implicit_commit.test
>
> per-file messages:
> mysql-test/r/implicit_commit.result
> Add 'OVERWRITE' flag to RESTORE
> mysql-test/t/implicit_commit.test
> Add 'OVERWRITE' flag to RESTORE
> === modified file 'mysql-test/r/implicit_commit.result'
> --- a/mysql-test/r/implicit_commit.result 2008-07-26 16:38:20 +0000
> +++ b/mysql-test/r/implicit_commit.result 2008-11-20 14:03:27 +0000
> @@ -1035,7 +1035,7 @@ YES
> # SQLCOM_RESTORE
> #
> INSERT INTO db1.trans (a) VALUES (1);
> -restore from 'backup_db1.ba';
> +restore from 'backup_db1.ba' overwrite;
> CALL db1.test_if_commit();
> IMPLICIT COMMIT
> YES
>
> === modified file 'mysql-test/t/implicit_commit.test'
> --- a/mysql-test/t/implicit_commit.test 2008-07-27 13:14:46 +0000
> +++ b/mysql-test/t/implicit_commit.test 2008-11-20 14:03:27 +0000
> @@ -1136,7 +1136,7 @@ source include/implicit_commit_helper.in
> --echo #
>
> let $statement=
> - restore from 'backup_db1.ba';
> + restore from 'backup_db1.ba' overwrite;
> source include/implicit_commit_helper.inc;
>
> --remove_file $MYSQLTEST_VARDIR/master-data/backup_db1.ba
>
>
