From: Date: November 20 2008 3:07pm Subject: bzr commit into mysql-6.0-backup branch (jorgen.loland:2742) Bug#17823 List-Archive: http://lists.mysql.com/commits/59382 X-Bug: 17823 Message-Id: <20081120140734.4C5F03B802A@atum06.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///localhome/jl208045/mysql/mysql-6.0-backup-empty/ 2742 Jorgen Loland 2008-11-20 Bug#17823 - 'arc' directories inside database directories Reenable backup_no_data.test that failed due to this bug. modified: mysql-test/suite/backup/r/backup_ddl_blocker.result mysql-test/suite/backup/r/backup_no_data.result mysql-test/suite/backup/t/backup_ddl_blocker.test mysql-test/suite/backup/t/backup_no_data.test mysql-test/suite/backup/t/disabled.def per-file messages: mysql-test/suite/backup/r/backup_ddl_blocker.result Add OVERWRITE flag to RESTORE mysql-test/suite/backup/r/backup_no_data.result Add OVERWRITE flag to RESTORE mysql-test/suite/backup/t/backup_ddl_blocker.test Add OVERWRITE flag to RESTORE mysql-test/suite/backup/t/backup_no_data.test Add OVERWRITE flag to RESTORE mysql-test/suite/backup/t/disabled.def Reenable backup_no_data.test that failed due to bug#17823. === modified file 'mysql-test/suite/backup/r/backup_ddl_blocker.result' --- a/mysql-test/suite/backup/r/backup_ddl_blocker.result 2008-10-07 17:15:44 +0000 +++ b/mysql-test/suite/backup/r/backup_ddl_blocker.result 2008-11-20 14:07:23 +0000 @@ -112,7 +112,7 @@ con1: Dropping the database tables DROP TABLE bup_ddl_blocker.t1, bup_ddl_blocker.t2, bup_ddl_blocker.t3, bup_ddl_blocker.t4; con1: Restoring the database -RESTORE FROM "bup_ddl_blocker.bak"; +RESTORE FROM "bup_ddl_blocker.bak" OVERWRITE; backup_id # con1: Showing columns that were backed up @@ -173,13 +173,13 @@ con1: Activate synchronization points fo SET DEBUG_SYNC= 'before_block_ddl SIGNAL bup_blocked WAIT_FOR status_shown'; SET DEBUG_SYNC= 'after_block_ddl SIGNAL bup_started WAIT_FOR status_shown2'; con1: Restoring database -- will block with lock -RESTORE FROM "bup_ddl_blocker_orig.bak"; +RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE; con6: Wait for con1 to reach its synchronization point. SET DEBUG_SYNC= 'now WAIT_FOR bup_blocked'; SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RESTORE FROM%"; state info -debug sync point: before_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" +debug sync point: before_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "CREATE TABLE bup_ddl_blocker.t1%"; state info @@ -193,7 +193,7 @@ SET DEBUG_SYNC= 'now SIGNAL status_shown SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RESTORE FROM%"; state info -debug sync point: after_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" +debug sync point: after_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE con4: Activate synchronization point for DDL. SET DEBUG_SYNC= 'before_check_ddl_blocked SIGNAL con4_started WAIT_FOR status_shown2'; @@ -352,7 +352,7 @@ con1: Dropping the database tables DROP TABLE bup_ddl_blocker.t01, bup_ddl_blocker.t2, bup_ddl_blocker.t03, bup_ddl_blocker.t4; con1: Restoring the database -RESTORE FROM "bup_ddl_blocker.bak"; +RESTORE FROM "bup_ddl_blocker.bak" OVERWRITE; backup_id # con1: Showing columns that were backed up @@ -407,13 +407,13 @@ con1: Activate synchronization points fo SET DEBUG_SYNC= 'before_block_ddl SIGNAL bup_blocked WAIT_FOR status_shown'; SET DEBUG_SYNC= 'after_block_ddl SIGNAL bup_started WAIT_FOR status_shown2'; con1: Restoring database -- will block with lock -RESTORE FROM "bup_ddl_blocker_orig.bak"; +RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE; con6: Wait for con1 to reach its synchronization point. SET DEBUG_SYNC= 'now WAIT_FOR bup_blocked'; SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RESTORE FROM%"; state info -debug sync point: before_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" +debug sync point: before_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RENAME TABLE bup_ddl_blocker.t1%"; state info @@ -427,7 +427,7 @@ SET DEBUG_SYNC= 'now SIGNAL status_shown SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RESTORE FROM%"; state info -debug sync point: after_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" +debug sync point: after_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE con4: Activate synchronization point for DDL. SET DEBUG_SYNC= 'before_check_ddl_blocked SIGNAL con4_started WAIT_FOR status_shown2'; @@ -581,7 +581,7 @@ t3 con1: Dropping the database tables DROP TABLE bup_ddl_blocker.t1, bup_ddl_blocker.t3; con1: Restoring the database -RESTORE FROM "bup_ddl_blocker.bak"; +RESTORE FROM "bup_ddl_blocker.bak" OVERWRITE; backup_id # con1: Showing columns that were backed up @@ -634,13 +634,13 @@ con1: Activate synchronization points fo SET DEBUG_SYNC= 'before_block_ddl SIGNAL bup_blocked WAIT_FOR status_shown'; SET DEBUG_SYNC= 'after_block_ddl SIGNAL bup_started WAIT_FOR status_shown2'; con1: Restoring database -- will block with lock -RESTORE FROM "bup_ddl_blocker_orig.bak"; +RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE; con6: Wait for con1 to reach its synchronization point. SET DEBUG_SYNC= 'now WAIT_FOR bup_blocked'; SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RESTORE FROM%"; state info -debug sync point: before_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" +debug sync point: before_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "OPTIMIZE TABLE bup_ddl_blocker.t1%"; state info @@ -654,7 +654,7 @@ SET DEBUG_SYNC= 'now SIGNAL status_shown SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RESTORE FROM%"; state info -debug sync point: after_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" +debug sync point: after_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE con4: Activate synchronization point for DDL. SET DEBUG_SYNC= 'before_check_ddl_blocked SIGNAL con4_started WAIT_FOR status_shown2'; @@ -806,7 +806,7 @@ con1: Dropping the database tables DROP DATABASE bup_ddl_blocker_1; DROP DATABASE bup_ddl_blocker_3; con1: Restoring the database -RESTORE FROM "bup_ddl_blocker.bak"; +RESTORE FROM "bup_ddl_blocker.bak" OVERWRITE; backup_id # con1: Showing databases that were backed up @@ -862,13 +862,13 @@ con1: Activate synchronization points fo SET DEBUG_SYNC= 'before_block_ddl SIGNAL bup_blocked WAIT_FOR status_shown'; SET DEBUG_SYNC= 'after_block_ddl SIGNAL bup_started WAIT_FOR status_shown2'; con1: Restoring database -- will block with lock -RESTORE FROM "bup_ddl_blocker_orig.bak"; +RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE; con6: Wait for con1 to reach its synchronization point. SET DEBUG_SYNC= 'now WAIT_FOR bup_blocked'; SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RESTORE FROM%"; state info -debug sync point: before_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" +debug sync point: before_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "CREATE DATABASE bup_ddl_blocker_1%"; state info @@ -882,7 +882,7 @@ SET DEBUG_SYNC= 'now SIGNAL status_shown SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RESTORE FROM%"; state info -debug sync point: after_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" +debug sync point: after_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE con4: Activate synchronization point for DDL. SET DEBUG_SYNC= 'before_check_ddl_blocked SIGNAL con4_started WAIT_FOR status_shown2'; @@ -1040,7 +1040,7 @@ con1: Dropping the database tables DROP DATABASE bup_ddl_blocker_2; DROP DATABASE bup_ddl_blocker_4; con1: Restoring the database -RESTORE FROM "bup_ddl_blocker.bak"; +RESTORE FROM "bup_ddl_blocker.bak" OVERWRITE; backup_id # con1: Showing databases that were backed up @@ -1112,13 +1112,13 @@ con1: Activate synchronization points fo SET DEBUG_SYNC= 'before_block_ddl SIGNAL bup_blocked WAIT_FOR status_shown'; SET DEBUG_SYNC= 'after_block_ddl SIGNAL bup_started WAIT_FOR status_shown2'; con1: Restoring database -- will block with lock -RESTORE FROM "bup_ddl_blocker_orig.bak"; +RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE; con6: Wait for con1 to reach its synchronization point. SET DEBUG_SYNC= 'now WAIT_FOR bup_blocked'; SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RESTORE FROM%"; state info -debug sync point: before_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" +debug sync point: before_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "ALTER DATABASE bup_ddl_blocker_2%"; state info @@ -1132,7 +1132,7 @@ SET DEBUG_SYNC= 'now SIGNAL status_shown SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RESTORE FROM%"; state info -debug sync point: after_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" +debug sync point: after_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE con4: Activate synchronization point for DDL. SET DEBUG_SYNC= 'before_check_ddl_blocked SIGNAL con4_started WAIT_FOR status_shown2'; @@ -1335,7 +1335,7 @@ DROP DATABASE bup_ddl_blocker_2; DROP DATABASE bup_ddl_blocker_3; DROP DATABASE bup_ddl_blocker_4; con1: Restoring the database -RESTORE FROM "bup_ddl_blocker.bak"; +RESTORE FROM "bup_ddl_blocker.bak" OVERWRITE; backup_id # con1: Showing databases that were backed up @@ -1428,13 +1428,13 @@ con1: Activate synchronization points fo SET DEBUG_SYNC= 'before_block_ddl SIGNAL bup_blocked WAIT_FOR status_shown'; SET DEBUG_SYNC= 'after_block_ddl SIGNAL bup_started WAIT_FOR status_shown2'; con1: Restoring database -- will block with lock -RESTORE FROM "bup_ddl_blocker_orig.bak"; +RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE; con6: Wait for con1 to reach its synchronization point. SET DEBUG_SYNC= 'now WAIT_FOR bup_blocked'; SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RESTORE FROM%"; state info -debug sync point: before_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" +debug sync point: before_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "CREATE INDEX 1t1col_b%"; state info @@ -1448,7 +1448,7 @@ SET DEBUG_SYNC= 'now SIGNAL status_shown SELECT state, info FROM INFORMATION_SCHEMA.PROCESSLIST WHERE info LIKE "RESTORE FROM%"; state info -debug sync point: after_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" +debug sync point: after_block_ddl RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE con4: Activate synchronization point for DDL. SET DEBUG_SYNC= 'before_check_ddl_blocked SIGNAL con4_started WAIT_FOR status_shown2'; === modified file 'mysql-test/suite/backup/r/backup_no_data.result' --- a/mysql-test/suite/backup/r/backup_no_data.result 2008-10-07 17:15:44 +0000 +++ b/mysql-test/suite/backup/r/backup_no_data.result 2008-11-20 14:07:23 +0000 @@ -15,7 +15,7 @@ Database information_schema mysql test -RESTORE FROM 'all.bak'; +RESTORE FROM 'all.bak' OVERWRITE; backup_id # SHOW DATABASES; @@ -38,7 +38,7 @@ mysql test SHOW TABLES IN empty_db; Tables_in_empty_db -RESTORE FROM 'all.bak'; +RESTORE FROM 'all.bak' OVERWRITE; backup_id # SHOW DATABASES; @@ -66,7 +66,7 @@ empty_db mysql other_db test -RESTORE FROM 'empty_db.bak'; +RESTORE FROM 'empty_db.bak' OVERWRITE; backup_id # USE empty_db; === modified file 'mysql-test/suite/backup/t/backup_ddl_blocker.test' --- a/mysql-test/suite/backup/t/backup_ddl_blocker.test 2008-10-24 08:25:48 +0000 +++ b/mysql-test/suite/backup/t/backup_ddl_blocker.test 2008-11-20 14:07:23 +0000 @@ -243,7 +243,7 @@ DROP TABLE bup_ddl_blocker.t1, bup_ddl_b --echo con1: Restoring the database --replace_column 1 # -RESTORE FROM "bup_ddl_blocker.bak"; +RESTORE FROM "bup_ddl_blocker.bak" OVERWRITE; --echo con1: Showing columns that were backed up @@ -297,7 +297,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con3_start SET DEBUG_SYNC= 'before_block_ddl SIGNAL bup_blocked WAIT_FOR status_shown'; SET DEBUG_SYNC= 'after_block_ddl SIGNAL bup_started WAIT_FOR status_shown2'; --echo con1: Restoring database -- will block with lock -send RESTORE FROM "bup_ddl_blocker_orig.bak"; +send RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE; connection con6; @@ -514,7 +514,7 @@ DROP TABLE bup_ddl_blocker.t01, bup_ddl_ --echo con1: Restoring the database --replace_column 1 # -RESTORE FROM "bup_ddl_blocker.bak"; +RESTORE FROM "bup_ddl_blocker.bak" OVERWRITE; --echo con1: Showing columns that were backed up --echo con1: Table t01 should be in restore @@ -564,7 +564,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con3_start SET DEBUG_SYNC= 'before_block_ddl SIGNAL bup_blocked WAIT_FOR status_shown'; SET DEBUG_SYNC= 'after_block_ddl SIGNAL bup_started WAIT_FOR status_shown2'; --echo con1: Restoring database -- will block with lock -send RESTORE FROM "bup_ddl_blocker_orig.bak"; +send RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE; connection con6; @@ -774,7 +774,7 @@ DROP TABLE bup_ddl_blocker.t1, bup_ddl_b --echo con1: Restoring the database --replace_column 1 # -RESTORE FROM "bup_ddl_blocker.bak"; +RESTORE FROM "bup_ddl_blocker.bak" OVERWRITE; --echo con1: Showing columns that were backed up --echo con1: Table t2 should not be in restore @@ -823,7 +823,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con3_start SET DEBUG_SYNC= 'before_block_ddl SIGNAL bup_blocked WAIT_FOR status_shown'; SET DEBUG_SYNC= 'after_block_ddl SIGNAL bup_started WAIT_FOR status_shown2'; --echo con1: Restoring database -- will block with lock -send RESTORE FROM "bup_ddl_blocker_orig.bak"; +send RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE; connection con6; @@ -1061,7 +1061,7 @@ DROP DATABASE bup_ddl_blocker_3; --echo con1: Restoring the database --replace_column 1 # --disable_warnings -RESTORE FROM "bup_ddl_blocker.bak"; +RESTORE FROM "bup_ddl_blocker.bak" OVERWRITE; --enable_warnings --echo con1: Showing databases that were backed up @@ -1137,7 +1137,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con3_start SET DEBUG_SYNC= 'before_block_ddl SIGNAL bup_blocked WAIT_FOR status_shown'; SET DEBUG_SYNC= 'after_block_ddl SIGNAL bup_started WAIT_FOR status_shown2'; --echo con1: Restoring database -- will block with lock -send RESTORE FROM "bup_ddl_blocker_orig.bak"; +send RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE; connection con6; @@ -1381,7 +1381,7 @@ DROP DATABASE bup_ddl_blocker_4; --echo con1: Restoring the database --replace_column 1 # -RESTORE FROM "bup_ddl_blocker.bak"; +RESTORE FROM "bup_ddl_blocker.bak" OVERWRITE; --echo con1: Showing databases that were backed up --echo con1: bup_ddl_blocker_1 has been renamed and @@ -1465,7 +1465,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con3_start SET DEBUG_SYNC= 'before_block_ddl SIGNAL bup_blocked WAIT_FOR status_shown'; SET DEBUG_SYNC= 'after_block_ddl SIGNAL bup_started WAIT_FOR status_shown2'; --echo con1: Restoring database -- will block with lock -send RESTORE FROM "bup_ddl_blocker_orig.bak"; +send RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE; connection con6; @@ -1732,7 +1732,7 @@ DROP DATABASE bup_ddl_blocker_4; --echo con1: Restoring the database --replace_column 1 # --disable_warnings -RESTORE FROM "bup_ddl_blocker.bak"; +RESTORE FROM "bup_ddl_blocker.bak" OVERWRITE; --enable_warnings --echo con1: Showing databases that were backed up @@ -1829,7 +1829,7 @@ SET DEBUG_SYNC= 'now WAIT_FOR con3_start SET DEBUG_SYNC= 'before_block_ddl SIGNAL bup_blocked WAIT_FOR status_shown'; SET DEBUG_SYNC= 'after_block_ddl SIGNAL bup_started WAIT_FOR status_shown2'; --echo con1: Restoring database -- will block with lock -send RESTORE FROM "bup_ddl_blocker_orig.bak"; +send RESTORE FROM "bup_ddl_blocker_orig.bak" OVERWRITE; connection con6; === modified file 'mysql-test/suite/backup/t/backup_no_data.test' --- a/mysql-test/suite/backup/t/backup_no_data.test 2008-10-09 09:55:08 +0000 +++ b/mysql-test/suite/backup/t/backup_no_data.test 2008-11-20 14:07:23 +0000 @@ -26,7 +26,7 @@ DROP DATABASE other_db; SHOW DATABASES; --replace_column 1 # -RESTORE FROM 'all.bak'; +RESTORE FROM 'all.bak' OVERWRITE; SHOW DATABASES; @@ -40,7 +40,7 @@ SHOW DATABASES; SHOW TABLES IN empty_db; --replace_column 1 # -RESTORE FROM 'all.bak'; +RESTORE FROM 'all.bak' OVERWRITE; SHOW DATABASES; SHOW TABLES IN empty_db; @@ -64,7 +64,7 @@ BACKUP DATABASE empty_db TO 'empty_db.ba SHOW DATABASES; --replace_column 1 # -RESTORE FROM 'empty_db.bak'; +RESTORE FROM 'empty_db.bak' OVERWRITE; USE empty_db; === modified file 'mysql-test/suite/backup/t/disabled.def' --- a/mysql-test/suite/backup/t/disabled.def 2008-10-30 10:41:48 +0000 +++ b/mysql-test/suite/backup/t/disabled.def 2008-11-20 14:07:23 +0000 @@ -12,5 +12,4 @@ backup_no_engine : Bug#36021 2008-04-13 rsomla server crashes when openning table with unknown storage engine backup_triggers_and_events : Bug#37762 2008-07-01 rafal Test fails on remove_file for unknown reasons #backup_no_be : Bug#38023 2008-07-16 rafal Test triggers valgrind warnings described in the bug -backup_no_data : Bug#17823 2008-10-09 rafal Tests in main suite leave undeleted files causing this test to fail -backup_ddl_blocker : Bug#17823 2008-10-09 rafal Tests in main suite leave undeleted files causing this test to fail +#backup_ddl_blocker : Bug#17823 2008-10-09 rafal Tests in main suite leave undeleted files causing this test to fail