2798 Ingo Struewing 2009-04-22
Post-pushbuild fix: Stabilized test cases.
@ mysql-test/suite/backup/r/backup_external_non_win.result
Post-pushbuild fix: Updated test result.
@ mysql-test/suite/backup/r/backup_triggers_and_events.result
Post-pushbuild fix: Updated test result.
@ mysql-test/suite/backup/t/backup_external_non_win.test
Post-pushbuild fix: Added prerequisite have_falcon, tablespace cleanup.
@ mysql-test/suite/backup/t/backup_triggers_and_events.test
Post-pushbuild fix: Updated synchronization to stabilize the test case.
modified:
mysql-test/suite/backup/r/backup_external_non_win.result
mysql-test/suite/backup/r/backup_triggers_and_events.result
mysql-test/suite/backup/t/backup_external_non_win.test
mysql-test/suite/backup/t/backup_triggers_and_events.test
2797 Ingo Struewing 2009-04-21 [merge]
auto-merge
modified:
mysql-test/suite/backup/r/backup_client.result
mysql-test/suite/backup/r/backup_client_binlog.result
sql/backup/image_info.cc
=== modified file 'mysql-test/suite/backup/r/backup_external_non_win.result'
--- a/mysql-test/suite/backup/r/backup_external_non_win.result 2009-03-25 22:17:35 +0000
+++ b/mysql-test/suite/backup/r/backup_external_non_win.result 2009-04-22 08:31:38 +0000
@@ -3,6 +3,7 @@
#
DROP DATABASE IF EXISTS db1;
DROP DATABASE IF EXISTS db2;
+DROP TABLESPACE ts Engine=Falcon;
#
# Create databases and tables
#
@@ -307,3 +308,4 @@ t1 CREATE TABLE `t1` (
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP DATABASE db1;
DROP DATABASE db2;
+DROP TABLESPACE ts Engine=Falcon;
=== modified file 'mysql-test/suite/backup/r/backup_triggers_and_events.result'
--- a/mysql-test/suite/backup/r/backup_triggers_and_events.result 2009-03-16 13:43:52 +0000
+++ b/mysql-test/suite/backup/r/backup_triggers_and_events.result 2009-04-22 08:31:38 +0000
@@ -57,14 +57,18 @@ BACKUP DATABASE db TO 'db.bak';
backup_id
#
DROP DATABASE db;
-Enabling event scheduler.
-SET GLOBAL event_scheduler=on;
con1: clearing log table and starting RESTORE operation.
con1: RESTORE will pause after restoring table data.
-SET DEBUG_SYNC = 'restore_table_data_before_end SIGNAL waiting WAIT_FOR continue';
+SET DEBUG_SYNC = 'after_backup_start_restore SIGNAL started WAIT_FOR continue';
+SET DEBUG_SYNC = 'restore_table_data_before_end SIGNAL waiting WAIT_FOR finish';
DELETE FROM test.logt;
RESTORE FROM 'db.bak';
+SET DEBUG_SYNC = 'now WAIT_FOR started';
+Enabling event scheduler.
+SET GLOBAL event_scheduler=on;
+Get BACKUP going.
SELECT now() INTO @start;
+SET DEBUG_SYNC = 'now SIGNAL continue';
con2: checking that there are no triggers and events at the end of RESTORE execution.
SET DEBUG_SYNC = 'now WAIT_FOR waiting';
SHOW TRIGGERS FROM db;
@@ -72,14 +76,14 @@ SHOW EVENTS IN db;
con2: activating trigger in test database.
INSERT INTO test.t1 VALUES (1);
con2: ensuring that RESTORE takes at least 3 secs.
-SET DEBUG_SYNC = 'now SIGNAL continue';
+SET DEBUG_SYNC = 'now SIGNAL finish';
con1: finishing RESTORE operation.
backup_id
#
SET GLOBAL event_scheduler=off;
con2: checking that RESTORE took more than 2 secs.
-SELECT timediff(now(),@start) > 2;
-timediff(now(),@start) > 2
+SELECT timediff(now(),@start) > 3;
+timediff(now(),@start) > 3
1
Checking that objects have been restored.
USE db;
@@ -173,19 +177,19 @@ character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Checking that no db event or trigger fired during RESTORE.
-SELECT * FROM test.logt WHERE db = 'db' AND timediff(ts,@start) < 2;
+SELECT * FROM test.logt WHERE db = 'db' AND timediff(ts,@start) < 3;
ts db msg
Checking that test event and trigger could fire.
SELECT count(*) > 0 FROM test.logt
WHERE db = 'test'
AND msg LIKE '%trigger fired%'
-AND timediff(ts,@start) < 2;
+AND timediff(ts,@start) < 3;
count(*) > 0
1
SELECT count(*) > 0 FROM test.logt
WHERE db = 'test'
AND msg LIKE '%event fired%'
-AND timediff(ts,@start) < 2;
+AND timediff(ts,@start) < 3;
count(*) > 0
1
Cleaning up.
=== modified file 'mysql-test/suite/backup/t/backup_external_non_win.test'
--- a/mysql-test/suite/backup/t/backup_external_non_win.test 2009-04-07 19:18:19 +0000
+++ b/mysql-test/suite/backup/t/backup_external_non_win.test 2009-04-22 08:31:38 +0000
@@ -7,6 +7,7 @@
--source include/not_embedded.inc
--source include/have_innodb.inc
+--source include/have_falcon.inc
--source include/not_windows.inc
--source suite/backup/include/backup_ext.inc
--source suite/backup/include/have_dbi.inc
@@ -21,6 +22,8 @@ let $MYSQLD_DATADIR= `select @@datadir`;
--disable_warnings
DROP DATABASE IF EXISTS db1;
DROP DATABASE IF EXISTS db2;
+--error 0,ER_NO_SUCH_TABLESPACE
+DROP TABLESPACE ts Engine=Falcon;
--enable_warnings
--echo #
@@ -230,5 +233,5 @@ SHOW CREATE TABLE db1.t1;
DROP DATABASE db1;
DROP DATABASE db2;
-
+DROP TABLESPACE ts Engine=Falcon;
=== modified file 'mysql-test/suite/backup/t/backup_triggers_and_events.test'
--- a/mysql-test/suite/backup/t/backup_triggers_and_events.test 2009-03-16 13:43:52 +0000
+++ b/mysql-test/suite/backup/t/backup_triggers_and_events.test 2009-04-22 08:31:38 +0000
@@ -118,9 +118,6 @@ delimiter ;||
BACKUP DATABASE db TO 'db.bak';
DROP DATABASE db;
---echo Enabling event scheduler.
-SET GLOBAL event_scheduler=on;
-
--connection con1
--echo con1: clearing log table and starting RESTORE operation.
@@ -130,14 +127,23 @@ SET GLOBAL event_scheduler=on;
# after restore drivers have finished their job but before they have been shoot
# down.
-SET DEBUG_SYNC = 'restore_table_data_before_end SIGNAL waiting WAIT_FOR continue';
+SET DEBUG_SYNC = 'after_backup_start_restore SIGNAL started WAIT_FOR continue';
+SET DEBUG_SYNC = 'restore_table_data_before_end SIGNAL waiting WAIT_FOR finish';
DELETE FROM test.logt;
--send RESTORE FROM 'db.bak'
--connection con2
+SET DEBUG_SYNC = 'now WAIT_FOR started';
+--echo Enabling event scheduler.
+SET GLOBAL event_scheduler=on;
+# Give it a second to start
+--sleep 1
+
+--echo Get BACKUP going.
# Record the time when RESTORE has started.
SELECT now() INTO @start;
+SET DEBUG_SYNC = 'now SIGNAL continue';
--echo con2: checking that there are no triggers and events at the end of RESTORE execution.
@@ -155,8 +161,8 @@ INSERT INTO test.t1 VALUES (1);
# This is so that db.ev event has chance to fire if it is not correctly handled
# (e.g. enabled during table data restore).
---sleep 3
-SET DEBUG_SYNC = 'now SIGNAL continue';
+--sleep 4
+SET DEBUG_SYNC = 'now SIGNAL finish';
--connection con1
@@ -169,7 +175,7 @@ SET GLOBAL event_scheduler=off;
-- echo con2: checking that RESTORE took more than 2 secs.
-SELECT timediff(now(),@start) > 2;
+SELECT timediff(now(),@start) > 3;
--echo Checking that objects have been restored.
@@ -186,26 +192,26 @@ SELECT count(*) FROM db.t1;
# There should be no entries in the log table from the time when RESTORE
# was running (but there could be entries inserted by event firing *after*
-# RESTORE has completed). We know that RESTORE took at least 3 sec and we
-# take 2 sec window form the beginning of the operation. This is enough
+# RESTORE has completed). We know that RESTORE took at least 4 sec and we
+# take 3 sec window from the beginning of the operation. This is enough
# to see db.ev in case it fired during RESTORE operation (this event is sheduled
# to fire every second).
-SELECT * FROM test.logt WHERE db = 'db' AND timediff(ts,@start) < 2;
+SELECT * FROM test.logt WHERE db = 'db' AND timediff(ts,@start) < 3;
--echo Checking that test event and trigger could fire.
-# Checking that the trigger has fired.
+# Checking that the test trigger has fired during RESTORE.
SELECT count(*) > 0 FROM test.logt
WHERE db = 'test'
AND msg LIKE '%trigger fired%'
-AND timediff(ts,@start) < 2;
+AND timediff(ts,@start) < 3;
-# Checking that the event has fired.
+# Checking that the test event has fired during RESTORE.
SELECT count(*) > 0 FROM test.logt
WHERE db = 'test'
AND msg LIKE '%event fired%'
-AND timediff(ts,@start) < 2;
+AND timediff(ts,@start) < 3;
--echo Cleaning up.
SET DEBUG_SYNC = 'RESET';
Attachment: [text/bzr-bundle] bzr/ingo.struewing@sun.com-20090422083138-ij65aqdy6z2nllvy.bundle
| Thread |
|---|
| • bzr push into mysql-6.0 branch (ingo.struewing:2797 to 2798) | Ingo Struewing | 22 Apr |
