#At file:///home/rith/Work/MySQL/Bug52207/ based on revid:satya.bn@stripped
3112 Ritheesh Vedire 2010-03-19
BUG#52207: PB2 Failures, Rename SKIP_GAP_EVENT
to SKIP_INCIDENT_EVENT
Fix for BUG#51696 renamed SKIP_GAP_EVENT to SKIP_INCIDENT_EVENT.
Rename was done in only rpl_backup.test.
This patch replaces SKIP_GAP_EVENT with SKIP_INCIDENT_EVENT
in all the remaining rpl_backup* tests.
@ mysql-test/suite/rpl/r/rpl_backup_dobinlog.result
Corrected result file.
@ mysql-test/suite/rpl/r/rpl_backup_dobinlog_multi.result
Corrected result file.
@ mysql-test/suite/rpl/r/rpl_backup_dorepl.result
Corrected result file.
@ mysql-test/suite/rpl/r/rpl_backup_dorepl_table.result
Corrected result file.
@ mysql-test/suite/rpl/r/rpl_backup_ignore_multi.result
Corrected result file.
@ mysql-test/suite/rpl/r/rpl_backup_ignorebinlog.result
Corrected result file.
@ mysql-test/suite/rpl/r/rpl_backup_ignorerepl.result
Corrected result file.
@ mysql-test/suite/rpl/r/rpl_backup_ignorerepl_table.result
Corrected result file.
@ mysql-test/suite/rpl/t/rpl_backup_dobinlog.test
Replaced SKIP_GAP_EVENT with SKIP_INCIDENT_EVENT.
@ mysql-test/suite/rpl/t/rpl_backup_dobinlog_multi.test
Replaced SKIP_GAP_EVENT with SKIP_INCIDENT_EVENT.
@ mysql-test/suite/rpl/t/rpl_backup_dorepl.test
Replaced SKIP_GAP_EVENT with SKIP_INCIDENT_EVENT.
@ mysql-test/suite/rpl/t/rpl_backup_dorepl_table.test
Replaced SKIP_GAP_EVENT with SKIP_INCIDENT_EVENT.
@ mysql-test/suite/rpl/t/rpl_backup_ignore_multi.test
Replaced SKIP_GAP_EVENT with SKIP_INCIDENT_EVENT.
@ mysql-test/suite/rpl/t/rpl_backup_ignorebinlog.test
Replaced SKIP_GAP_EVENT with SKIP_INCIDENT_EVENT.
@ mysql-test/suite/rpl/t/rpl_backup_ignorerepl.test
Replaced SKIP_GAP_EVENT with SKIP_INCIDENT_EVENT.
@ mysql-test/suite/rpl/t/rpl_backup_ignorerepl_table.test
Replaced SKIP_GAP_EVENT with SKIP_INCIDENT_EVENT.
modified:
mysql-test/suite/rpl/r/rpl_backup_dobinlog.result
mysql-test/suite/rpl/r/rpl_backup_dobinlog_multi.result
mysql-test/suite/rpl/r/rpl_backup_dorepl.result
mysql-test/suite/rpl/r/rpl_backup_dorepl_table.result
mysql-test/suite/rpl/r/rpl_backup_ignore_multi.result
mysql-test/suite/rpl/r/rpl_backup_ignorebinlog.result
mysql-test/suite/rpl/r/rpl_backup_ignorerepl.result
mysql-test/suite/rpl/r/rpl_backup_ignorerepl_table.result
mysql-test/suite/rpl/t/rpl_backup_dobinlog.test
mysql-test/suite/rpl/t/rpl_backup_dobinlog_multi.test
mysql-test/suite/rpl/t/rpl_backup_dorepl.test
mysql-test/suite/rpl/t/rpl_backup_dorepl_table.test
mysql-test/suite/rpl/t/rpl_backup_ignore_multi.test
mysql-test/suite/rpl/t/rpl_backup_ignorebinlog.test
mysql-test/suite/rpl/t/rpl_backup_ignorerepl.test
mysql-test/suite/rpl/t/rpl_backup_ignorerepl_table.test
=== modified file 'mysql-test/suite/rpl/r/rpl_backup_dobinlog.result'
--- a/mysql-test/suite/rpl/r/rpl_backup_dobinlog.result 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_backup_dobinlog.result 2010-03-19 15:15:38 +0000
@@ -473,15 +473,15 @@ id name
10 sam
---------------------------------------------------------
-# * TEST 4 * : PERFORM RESTORE WITH SKIP_GAP_EVENT
+# * TEST 4 * : PERFORM RESTORE WITH SKIP_INCIDENT_EVENT
# Connect to master ..
-# Perform restore with skip_gap_event
+# Perform restore with skip_incident_event
# Get master's binlog position before restore.
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is not issued as a result of restore
-# with skip_gap_event
+# with skip_incident_event
SHOW BINLOG EVENTS IN '<binlog_file>' FROM <master_pos>;
Log_name Pos Event_type Server_id End_log_pos Info
# Insert some contents in db1 to verify replication is still running
@@ -623,11 +623,11 @@ Slave_SQL_Running
Yes
--------------------------------------------------------------
-# * TEST 6 *: PERFORM RESTORE FROM db123.bak USING SKIP_GAP_EVENT
+# * TEST 6 *: PERFORM RESTORE FROM db123.bak USING SKIP_INCIDENT_EVENT
# Connecting to master ...
# Get master's binlog position before restore.
-# Perform restore using skip_gap_event.
-RESTORE FROM 'db123.bak' OVERWRITE SKIP_GAP_EVENT;
+# Perform restore using skip_incident_event.
+RESTORE FROM 'db123.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is not issued as a result of restore for
=== modified file 'mysql-test/suite/rpl/r/rpl_backup_dobinlog_multi.result'
--- a/mysql-test/suite/rpl/r/rpl_backup_dobinlog_multi.result 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_backup_dobinlog_multi.result 2010-03-19 15:15:38 +0000
@@ -748,10 +748,10 @@ ERROR 42S02: Table 'db2.t21' doesn't exi
-----------------------------------------------------------------
# * TEST 3 *:PERFORM RESTORE OF NON REPLICATED DB (db2, db3) USING
-# SKIP_GAP_EVENT
+# SKIP_INCIDENT_EVENT
# Connecting to master ...
# Get master's binlog position before restore.
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is not issued as a result of restore for
@@ -809,7 +809,7 @@ id name
8 kite
-----------------------------------------------------------
-# TEST 4: PERFORM RESTORE IN SLAVE USING SKIP_GAP_EVENT
+# TEST 4: PERFORM RESTORE IN SLAVE USING SKIP_INCIDENT_EVENT
# Connecting to slave1 ...
STOP SLAVE;
# Perform restore in slave
@@ -832,7 +832,7 @@ Slave_SQL_Running
Yes
# Connecting to slave1 ...
STOP SLAVE;
-# Perform restore in slave using skip_gap_event
+# Perform restore in slave using skip_incident_event
backup_id
#
# Check that slave is running ...
=== modified file 'mysql-test/suite/rpl/r/rpl_backup_dorepl.result'
--- a/mysql-test/suite/rpl/r/rpl_backup_dorepl.result 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_backup_dorepl.result 2010-03-19 15:15:38 +0000
@@ -496,11 +496,11 @@ id name
10 sam
---------------------------------------------------------
-# ** TEST 4 ** : PERFORM RESTORE WITH SKIP_GAP_EVENT
+# ** TEST 4 ** : PERFORM RESTORE WITH SKIP_INCIDENT_EVENT
# Connect to master ..
-# Perform restore with skip_gap_event
+# Perform restore with skip_incident_event
# Get master's binlog position before restore.
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is not issued as a result of restore for
@@ -654,10 +654,10 @@ Slave_SQL_Running
Yes
------------------------------------------------------------
-# ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_GAP_EVENT
+# ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_INCIDENT_EVENT
# Connecting to master
-# Perform restore using skip_gap_event.
-RESTORE FROM 'db123.bak' OVERWRITE SKIP_GAP_EVENT;
+# Perform restore using skip_incident_event.
+RESTORE FROM 'db123.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Perform some operations in db1 and see if it is replicated
=== modified file 'mysql-test/suite/rpl/r/rpl_backup_dorepl_table.result'
--- a/mysql-test/suite/rpl/r/rpl_backup_dorepl_table.result 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_backup_dorepl_table.result 2010-03-19 15:15:38 +0000
@@ -369,14 +369,14 @@ SELECT * FROM db2.t21 WHERE id=88;
ERROR 42S02: Table 'db2.t21' doesn't exist
----------------------------------------------------------------
-# ** TEST 4 ** : PERFORM RESTORE WITH SKIP_GAP_EVENT
+# ** TEST 4 ** : PERFORM RESTORE WITH SKIP_INCIDENT_EVENT
# Connect to master ..
# Get master's binlog position before restore.
-RESTORE FROM 'db2.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db2.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is not issued as a result of restore
-# with skip_gap_event
+# with skip_incident_event
SHOW BINLOG EVENTS IN '<binlog_file>' FROM <master_pos>;
Log_name Pos Event_type Server_id End_log_pos Info
# Insert some contents in db1 to verify replication is still running
@@ -535,15 +535,15 @@ Slave_SQL_Running
Yes
------------------------------------------------------------
-# ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_GAP_EVENT
+# ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_INCIDENT_EVENT
# Connecting to master
-# Perform restore using skip_gap_event.
+# Perform restore using skip_incident_event.
# Get master's binlog position before restore.
-RESTORE FROM 'db12.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db12.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is issued as a result of restore
-# with skip_gap_event
+# with skip_incident_event
SHOW BINLOG EVENTS IN '<binlog_file>' FROM <master_pos>;
Log_name Pos Event_type Server_id End_log_pos Info
# Connecting to slave ...
=== modified file 'mysql-test/suite/rpl/r/rpl_backup_ignore_multi.result'
--- a/mysql-test/suite/rpl/r/rpl_backup_ignore_multi.result 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_backup_ignore_multi.result 2010-03-19 15:15:38 +0000
@@ -507,7 +507,6 @@ id
# Connecting to slave3 ...
SELECT * FROM db2.t21 WHERE id=100;
id
-100
# Connecting to slave2 ...
SHOW CREATE TABLE db2.t21;
Table Create Table
@@ -718,10 +717,10 @@ o
-----------------------------------------------------------------
# * TEST 3 *:PERFORM RESTORE OF NON REPLICATED DB (db1) USING
-# SKIP_GAP_EVENT
+# SKIP_INCIDENT_EVENT
# Connecting to master ...
# Get master's binlog position before restore.
-RESTORE FROM 'db1.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db1.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is not issued as a result of restore for
@@ -842,10 +841,10 @@ SELECT * FROM db1.t11 ORDER BY id;
ERROR 42S02: Table 'db1.t11' doesn't exist
-----------------------------------------------------------
-# TEST 5: PERFORM RESTORE IN SLAVE USING SKIP_GAP_EVENT
+# TEST 5: PERFORM RESTORE IN SLAVE USING SKIP_INCIDENT_EVENT
# Connecting to slave1 ...
STOP SLAVE;
-# Perform restore in slave using skip_gap_event
+# Perform restore in slave using skip_incident_event
backup_id
#
# Check that slave is running ...
=== modified file 'mysql-test/suite/rpl/r/rpl_backup_ignorebinlog.result'
--- a/mysql-test/suite/rpl/r/rpl_backup_ignorebinlog.result 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_backup_ignorebinlog.result 2010-03-19 15:15:38 +0000
@@ -320,9 +320,9 @@ num a
SELECT * FROM db2.t22;
a
-# ** TEST 1b **: PERFORM RESTORE FROM db1.bak WITH SKIP_GAP_EVENT
+# ** TEST 1b **: PERFORM RESTORE FROM db1.bak WITH SKIP_INCIDENT_EVENT
# Connect to master ...
-RESTORE FROM 'db1.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db1.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Perform some operations in db2 and db3
@@ -567,7 +567,7 @@ a
o
----------------------------------------------------------
-# ** TEST 4 ** : PERFORM RESTORE WITH SKIP_GAP_EVENT
+# ** TEST 4 ** : PERFORM RESTORE WITH SKIP_INCIDENT_EVENT
# Connect to master ..
SHOW FULL TABLES FROM db1;
Tables_in_db1 Table_type
@@ -585,7 +585,7 @@ t31 BASE TABLE
t32 BASE TABLE
v31 VIEW
# Get master's binlog position before restore.
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is not issued as a result of restore for
@@ -660,7 +660,7 @@ pet
# Drop the table in db2 and perform restore from db23.bak
DROP TABLE db2.t21;
# Execute restore
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Perform some operations in db2
@@ -730,7 +730,7 @@ Replicate_Ignore_Server_Ids
Master_Server_Id 1
# Check the db2.t21 table. The table will not exist as slaves become
# asyncronised when restore is performed for replicated databases with
-# skip_gap_event
+# skip_incident_event
SELECT * FROM db2.t21;
ERROR 42S02: Table 'db2.t21' doesn't exist
SHOW DATABASES LIKE 'db%';
@@ -904,11 +904,11 @@ Slave_SQL_Running
Yes
-----------------------------------------------------------
-# ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_GAP_EVENT
+# ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_INCIDENT_EVENT
# Connecting to master
-# Perform restore using skip_gap_event.
+# Perform restore using skip_incident_event.
# Get master's binlog position before restore.
-RESTORE FROM 'db123.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db123.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is not issued as a result of restore for
=== modified file 'mysql-test/suite/rpl/r/rpl_backup_ignorerepl.result'
--- a/mysql-test/suite/rpl/r/rpl_backup_ignorerepl.result 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_backup_ignorerepl.result 2010-03-19 15:15:38 +0000
@@ -325,9 +325,9 @@ num a
SELECT * FROM db2.t22;
a
-# ** TEST 1b **: PERFORM RESTORE FROM db1.bak WITH SKIP_GAP_EVENT
+# ** TEST 1b **: PERFORM RESTORE FROM db1.bak WITH SKIP_INCIDENT_EVENT
# Connect to master ...
-RESTORE FROM 'db1.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db1.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Perform some operations in db2 and db3
@@ -587,7 +587,7 @@ a
o
----------------------------------------------------------
-# ** TEST 4 ** : PERFORM RESTORE WITH SKIP_GAP_EVENT
+# ** TEST 4 ** : PERFORM RESTORE WITH SKIP_INCIDENT_EVENT
# Connect to master ..
# Get master's binlog position before restore.
SHOW FULL TABLES FROM db1;
@@ -605,7 +605,7 @@ Tables_in_db3 Table_type
t31 BASE TABLE
t32 BASE TABLE
v31 VIEW
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is not issued as a result of restore for
@@ -680,7 +680,7 @@ pet
# Drop the table in db2 and perform restore from db23.bak
DROP TABLE db2.t21;
# Execute restore
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Perform some operations in db2
@@ -750,7 +750,7 @@ Replicate_Ignore_Server_Ids
Master_Server_Id 1
# Check the db2.t21 table. The table will not exist as slaves become
# asyncronised when restore is performed for replicated databases with
-# skip_gap_event
+# skip_incident_event
SELECT * FROM db2.t21;
ERROR 42S02: Table 'db2.t21' doesn't exist
SHOW DATABASES LIKE 'db%';
@@ -931,11 +931,11 @@ Slave_SQL_Running
Yes
-----------------------------------------------------------
-# ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_GAP_EVENT
+# ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_INCIDENT_EVENT
# Connecting to master
-# Perform restore using skip_gap_event.
+# Perform restore using skip_incident_event.
# Get master's binlog position before restore.
-RESTORE FROM 'db123.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db123.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is not issued as a result of restore for
=== modified file 'mysql-test/suite/rpl/r/rpl_backup_ignorerepl_table.result'
--- a/mysql-test/suite/rpl/r/rpl_backup_ignorerepl_table.result 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_backup_ignorerepl_table.result 2010-03-19 15:15:38 +0000
@@ -380,14 +380,14 @@ id
88
----------------------------------------------------------------
-# ** TEST 4 ** : PERFORM RESTORE WITH SKIP_GAP_EVENT
+# ** TEST 4 ** : PERFORM RESTORE WITH SKIP_INCIDENT_EVENT
# Connect to master ..
# Get master's binlog position before restore.
-RESTORE FROM 'db2.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db2.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is not issued as a result of restore
-# with skip_gap_event
+# with skip_incident_event
SHOW BINLOG EVENTS IN '<binlog_file>' FROM <master_pos>;
Log_name Pos Event_type Server_id End_log_pos Info
# Insert some contents in db1 to verify replication is still running
@@ -548,15 +548,15 @@ Slave_SQL_Running
Yes
------------------------------------------------------------
-# ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_GAP_EVENT
+# ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_INCIDENT_EVENT
# Connecting to master
-# Perform restore using skip_gap_event.
+# Perform restore using skip_incident_event.
# Get master's binlog position before restore.
-RESTORE FROM 'db12.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db12.bak' OVERWRITE SKIP_INCIDENT_EVENT;
backup_id
#
# Show the incident event is not issued as a result of restore
-# with skip_gap_event
+# with skip_incident_event
SHOW BINLOG EVENTS IN '<binlog_file>' FROM <master_pos>;
Log_name Pos Event_type Server_id End_log_pos Info
# Connecting to slave
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_dobinlog.test'
--- a/mysql-test/suite/rpl/t/rpl_backup_dobinlog.test 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_dobinlog.test 2010-03-19 15:15:38 +0000
@@ -282,24 +282,24 @@ SELECT * FROM db1.t11 ORDER BY id;
--echo ---------------------------------------------------------
--echo
---echo # * TEST 4 * : PERFORM RESTORE WITH SKIP_GAP_EVENT
+--echo # * TEST 4 * : PERFORM RESTORE WITH SKIP_INCIDENT_EVENT
--echo # Connect to master ..
connection master;
---echo # Perform restore with skip_gap_event
+--echo # Perform restore with skip_incident_event
-# Performing restore from db23.bak with skip_gap_event. Restore of non-
+# Performing restore from db23.bak with skip_incident_event. Restore of non-
# replicated databases should not stop replication of db1 when
-# skip_gap_event is used.
+# skip_incident_event is used.
--echo # Get master's binlog position before restore.
let $master_before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
let $binlog_file = query_get_value("SHOW MASTER STATUS", File, 1);
--replace_column 1 #
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is not issued as a result of restore
---echo # with skip_gap_event
+--echo # with skip_incident_event
--replace_column 2 # 5 #
--replace_result $binlog_file <binlog_file> $master_before_pos <master_pos>
eval SHOW BINLOG EVENTS IN '$binlog_file' FROM $master_before_pos;
@@ -381,7 +381,7 @@ enable_query_log;
--echo
--echo --------------------------------------------------------------
---echo # * TEST 6 *: PERFORM RESTORE FROM db123.bak USING SKIP_GAP_EVENT
+--echo # * TEST 6 *: PERFORM RESTORE FROM db123.bak USING SKIP_INCIDENT_EVENT
--echo # Connecting to master ...
connection master;
@@ -389,10 +389,10 @@ connection master;
let $master_before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
let $binlog_file = query_get_value("SHOW MASTER STATUS", File, 1);
---echo # Perform restore using skip_gap_event.
+--echo # Perform restore using skip_incident_event.
--replace_column 1 #
-RESTORE FROM 'db123.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db123.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is not issued as a result of restore for
--echo # non replicated database.
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_dobinlog_multi.test'
--- a/mysql-test/suite/rpl/t/rpl_backup_dobinlog_multi.test 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_dobinlog_multi.test 2010-03-19 15:15:38 +0000
@@ -418,7 +418,7 @@ SELECT * FROM db2.t21 WHERE id=88;
--echo
--echo -----------------------------------------------------------------
--echo # * TEST 3 *:PERFORM RESTORE OF NON REPLICATED DB (db2, db3) USING
---echo # SKIP_GAP_EVENT
+--echo # SKIP_INCIDENT_EVENT
--echo # Connecting to master ...
connection master_a;
@@ -427,9 +427,9 @@ connection master_a;
let $master_before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
let $binlog_file = query_get_value("SHOW MASTER STATUS", File, 1);
-# Performing restore from db23.bak with skip_gap_event.
+# Performing restore from db23.bak with skip_incident_event.
--replace_column 1 #
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is not issued as a result of restore for
--echo # non replicated database.
@@ -483,7 +483,7 @@ SELECT * FROM db1.t11;
--echo
--echo -----------------------------------------------------------
---echo # TEST 4: PERFORM RESTORE IN SLAVE USING SKIP_GAP_EVENT
+--echo # TEST 4: PERFORM RESTORE IN SLAVE USING SKIP_INCIDENT_EVENT
--echo # Connecting to slave1 ...
connection slave_1;
@@ -529,10 +529,10 @@ connection slave_1;
STOP SLAVE;
--source include/wait_for_slave_to_stop.inc
---echo # Perform restore in slave using skip_gap_event
+--echo # Perform restore in slave using skip_incident_event
--disable_query_log
--replace_column 1 #
-eval RESTORE FROM '$MYSQLTEST_VARDIR/db23.bak' OVERWRITE SKIP_GAP_EVENT;
+eval RESTORE FROM '$MYSQLTEST_VARDIR/db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--enable_query_log
--echo # Check that slave is running ...
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_dorepl.test'
--- a/mysql-test/suite/rpl/t/rpl_backup_dorepl.test 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_dorepl.test 2010-03-19 15:15:38 +0000
@@ -312,21 +312,21 @@ SELECT * FROM db1.t11 ORDER BY id;
--echo ---------------------------------------------------------
--echo
---echo # ** TEST 4 ** : PERFORM RESTORE WITH SKIP_GAP_EVENT
+--echo # ** TEST 4 ** : PERFORM RESTORE WITH SKIP_INCIDENT_EVENT
--echo # Connect to master ..
Connection master;
---echo # Perform restore with skip_gap_event
+--echo # Perform restore with skip_incident_event
-# Performing restore from db23.bak with skip_gap_event. Restore of non-
+# Performing restore from db23.bak with skip_incident_event. Restore of non-
# replicated databases should not stop replication of db1 when
-# skip_gap_event is used.
+# skip_incident_event is used.
--echo # Get master's binlog position before restore.
let $master_before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
let $binlog_file = query_get_value("SHOW MASTER STATUS", File, 1);
--replace_column 1 #
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is not issued as a result of restore for
--echo # non replicated database.
@@ -420,13 +420,13 @@ enable_query_log;
--echo
---echo # ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_GAP_EVENT
+--echo # ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_INCIDENT_EVENT
--echo # Connecting to master
Connection master;
---echo # Perform restore using skip_gap_event.
+--echo # Perform restore using skip_incident_event.
--replace_column 1 #
-RESTORE FROM 'db123.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db123.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Perform some operations in db1 and see if it is replicated
--echo # in slaves
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_dorepl_table.test'
--- a/mysql-test/suite/rpl/t/rpl_backup_dorepl_table.test 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_dorepl_table.test 2010-03-19 15:15:38 +0000
@@ -316,23 +316,23 @@ SELECT * FROM db2.t21 WHERE id=88;
--echo ----------------------------------------------------------------
--echo
---echo # ** TEST 4 ** : PERFORM RESTORE WITH SKIP_GAP_EVENT
+--echo # ** TEST 4 ** : PERFORM RESTORE WITH SKIP_INCIDENT_EVENT
--echo # Connect to master ..
Connection master;
-# Performing restore from db2.bak with skip_gap_event. Restore of non-
+# Performing restore from db2.bak with skip_incident_event. Restore of non-
# replicated databases should not stop replication of db1 when
-# skip_gap_event is used.
+# skip_incident_event is used.
--echo # Get master's binlog position before restore.
let $master_before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
let $binlog_file = query_get_value("SHOW MASTER STATUS", File, 1);
--replace_column 1 #
-RESTORE FROM 'db2.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db2.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is not issued as a result of restore
---echo # with skip_gap_event
+--echo # with skip_incident_event
--replace_column 2 # 5 #
--replace_result $binlog_file <binlog_file> $master_before_pos <master_pos>
eval SHOW BINLOG EVENTS IN '$binlog_file' FROM $master_before_pos;
@@ -424,20 +424,20 @@ enable_query_log;
--echo ------------------------------------------------------------
--echo
---echo # ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_GAP_EVENT
+--echo # ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_INCIDENT_EVENT
--echo # Connecting to master
Connection master;
---echo # Perform restore using skip_gap_event.
+--echo # Perform restore using skip_incident_event.
--echo # Get master's binlog position before restore.
let $master_before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
let $binlog_file = query_get_value("SHOW MASTER STATUS", File, 1);
--replace_column 1 #
-RESTORE FROM 'db12.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db12.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is issued as a result of restore
---echo # with skip_gap_event
+--echo # with skip_incident_event
--replace_column 2 # 5 #
--replace_result $binlog_file <binlog_file> $master_before_pos <master_pos>
eval SHOW BINLOG EVENTS IN '$binlog_file' FROM $master_before_pos;
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_ignore_multi.test'
--- a/mysql-test/suite/rpl/t/rpl_backup_ignore_multi.test 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_ignore_multi.test 2010-03-19 15:15:38 +0000
@@ -398,7 +398,7 @@ SELECT * FROM db3.t32 WHERE a='o';
--echo
--echo -----------------------------------------------------------------
--echo # * TEST 3 *:PERFORM RESTORE OF NON REPLICATED DB (db1) USING
---echo # SKIP_GAP_EVENT
+--echo # SKIP_INCIDENT_EVENT
--echo # Connecting to master ...
Connection master_a;
@@ -407,9 +407,9 @@ Connection master_a;
let $master_before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
let $binlog_file = query_get_value("SHOW MASTER STATUS", File, 1);
-# Performing restore from db1.bak with skip_gap_event.
+# Performing restore from db1.bak with skip_incident_event.
--replace_column 1 #
-RESTORE FROM 'db1.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db1.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is not issued as a result of restore for
--echo # non replicated database.
@@ -522,7 +522,7 @@ SELECT * FROM db1.t11 ORDER BY id;
--echo
--echo -----------------------------------------------------------
---echo # TEST 5: PERFORM RESTORE IN SLAVE USING SKIP_GAP_EVENT
+--echo # TEST 5: PERFORM RESTORE IN SLAVE USING SKIP_INCIDENT_EVENT
--echo # Connecting to slave1 ...
Connection slave_1;
@@ -530,10 +530,10 @@ Connection slave_1;
STOP SLAVE;
--source include/wait_for_slave_to_stop.inc
---echo # Perform restore in slave using skip_gap_event
+--echo # Perform restore in slave using skip_incident_event
--disable_query_log
--replace_column 1 #
-eval RESTORE FROM '$MYSQLTEST_VARDIR/db1.bak' OVERWRITE SKIP_GAP_EVENT;
+eval RESTORE FROM '$MYSQLTEST_VARDIR/db1.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--enable_query_log
--echo # Check that slave is running ...
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_ignorebinlog.test'
--- a/mysql-test/suite/rpl/t/rpl_backup_ignorebinlog.test 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_ignorebinlog.test 2010-03-19 15:15:38 +0000
@@ -117,12 +117,12 @@ SELECT * FROM db3.t31 ORDER BY num;
SELECT * FROM db2.t22;
--echo
---echo # ** TEST 1b **: PERFORM RESTORE FROM db1.bak WITH SKIP_GAP_EVENT
+--echo # ** TEST 1b **: PERFORM RESTORE FROM db1.bak WITH SKIP_INCIDENT_EVENT
--echo # Connect to master ...
Connection master;
--replace_column 1 #
-RESTORE FROM 'db1.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db1.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Perform some operations in db2 and db3
USE db2;
@@ -305,7 +305,7 @@ SELECT * FROM db3.t32 WHERE a='o';
--echo ----------------------------------------------------------
--echo
---echo # ** TEST 4 ** : PERFORM RESTORE WITH SKIP_GAP_EVENT
+--echo # ** TEST 4 ** : PERFORM RESTORE WITH SKIP_INCIDENT_EVENT
--echo # Connect to master ..
Connection master;
@@ -317,9 +317,9 @@ SHOW FULL TABLES FROM db3;
let $master_before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
let $binlog_file = query_get_value("SHOW MASTER STATUS", File, 1);
-# Performing restore from db23.bak with skip_gap_event.
+# Performing restore from db23.bak with skip_incident_event.
--replace_column 1 #
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is not issued as a result of restore for
--echo # non replicated database.
@@ -358,7 +358,7 @@ DROP TABLE db2.t21;
--echo # Execute restore
--replace_column 1 #
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Perform some operations in db2
USE db2;
@@ -381,7 +381,7 @@ PURGE BACKUP LOGS;
--echo # Check the db2.t21 table. The table will not exist as slaves become
--echo # asyncronised when restore is performed for replicated databases with
---echo # skip_gap_event
+--echo # skip_incident_event
--error ER_NO_SUCH_TABLE
SELECT * FROM db2.t21;
@@ -484,17 +484,17 @@ enable_query_log;
--echo -----------------------------------------------------------
--echo
---echo # ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_GAP_EVENT
+--echo # ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_INCIDENT_EVENT
--echo # Connecting to master
Connection master;
---echo # Perform restore using skip_gap_event.
+--echo # Perform restore using skip_incident_event.
--echo # Get master's binlog position before restore.
let $master_before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
let $binlog_file = query_get_value("SHOW MASTER STATUS", File, 1);
--replace_column 1 #
-RESTORE FROM 'db123.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db123.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is not issued as a result of restore for
--echo # non replicated database.
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_ignorerepl.test'
--- a/mysql-test/suite/rpl/t/rpl_backup_ignorerepl.test 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_ignorerepl.test 2010-03-19 15:15:38 +0000
@@ -131,12 +131,12 @@ SELECT * FROM db3.t31 ORDER BY num;
SELECT * FROM db2.t22;
--echo
---echo # ** TEST 1b **: PERFORM RESTORE FROM db1.bak WITH SKIP_GAP_EVENT
+--echo # ** TEST 1b **: PERFORM RESTORE FROM db1.bak WITH SKIP_INCIDENT_EVENT
--echo # Connect to master ...
connection master;
--replace_column 1 #
-RESTORE FROM 'db1.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db1.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Perform some operations in db2 and db3
USE db2;
@@ -322,7 +322,7 @@ SELECT * FROM db3.t32 WHERE a='o';
--echo ----------------------------------------------------------
--echo
---echo # ** TEST 4 ** : PERFORM RESTORE WITH SKIP_GAP_EVENT
+--echo # ** TEST 4 ** : PERFORM RESTORE WITH SKIP_INCIDENT_EVENT
--echo # Connect to master ..
connection master;
@@ -334,9 +334,9 @@ SHOW FULL TABLES FROM db1;
SHOW FULL TABLES FROM db2;
SHOW FULL TABLES FROM db3;
-# Performing restore from db23.bak with skip_gap_event.
+# Performing restore from db23.bak with skip_incident_event.
--replace_column 1 #
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is not issued as a result of restore for
--echo # non replicated database.
@@ -375,7 +375,7 @@ DROP TABLE db2.t21;
--echo # Execute restore
--replace_column 1 #
-RESTORE FROM 'db23.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db23.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Perform some operations in db2
USE db2;
@@ -398,7 +398,7 @@ PURGE BACKUP LOGS;
--echo # Check the db2.t21 table. The table will not exist as slaves become
--echo # asyncronised when restore is performed for replicated databases with
---echo # skip_gap_event
+--echo # skip_incident_event
--error ER_NO_SUCH_TABLE
SELECT * FROM db2.t21;
@@ -512,17 +512,17 @@ enable_query_log;
--echo -----------------------------------------------------------
--echo
---echo # ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_GAP_EVENT
+--echo # ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_INCIDENT_EVENT
--echo # Connecting to master
connection master;
---echo # Perform restore using skip_gap_event.
+--echo # Perform restore using skip_incident_event.
--echo # Get master's binlog position before restore.
let $master_before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
let $binlog_file = query_get_value("SHOW MASTER STATUS", File, 1);
--replace_column 1 #
-RESTORE FROM 'db123.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db123.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is not issued as a result of restore for
--echo # non replicated database.
=== modified file 'mysql-test/suite/rpl/t/rpl_backup_ignorerepl_table.test'
--- a/mysql-test/suite/rpl/t/rpl_backup_ignorerepl_table.test 2010-03-11 20:53:40 +0000
+++ b/mysql-test/suite/rpl/t/rpl_backup_ignorerepl_table.test 2010-03-19 15:15:38 +0000
@@ -317,23 +317,23 @@ SELECT * FROM db2.t21 WHERE id=88;
--echo ----------------------------------------------------------------
--echo
---echo # ** TEST 4 ** : PERFORM RESTORE WITH SKIP_GAP_EVENT
+--echo # ** TEST 4 ** : PERFORM RESTORE WITH SKIP_INCIDENT_EVENT
--echo # Connect to master ..
Connection master;
-# Performing restore from db2.bak with skip_gap_event. Restore of non-
+# Performing restore from db2.bak with skip_incident_event. Restore of non-
# replicated databases should not stop replication of db1 when
-# skip_gap_event is used.
+# skip_incident_event is used.
--echo # Get master's binlog position before restore.
let $master_before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
let $binlog_file = query_get_value("SHOW MASTER STATUS", File, 1);
--replace_column 1 #
-RESTORE FROM 'db2.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db2.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is not issued as a result of restore
---echo # with skip_gap_event
+--echo # with skip_incident_event
--replace_column 2 # 5 #
--replace_result $binlog_file <binlog_file> $master_before_pos <master_pos>
eval SHOW BINLOG EVENTS IN '$binlog_file' FROM $master_before_pos;
@@ -425,20 +425,20 @@ enable_query_log;
--echo ------------------------------------------------------------
--echo
---echo # ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_GAP_EVENT
+--echo # ** TEST 6 **: PERFORM RESTORE FROM db123.bak USING SKIP_INCIDENT_EVENT
--echo # Connecting to master
Connection master;
---echo # Perform restore using skip_gap_event.
+--echo # Perform restore using skip_incident_event.
--echo # Get master's binlog position before restore.
let $master_before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
let $binlog_file = query_get_value("SHOW MASTER STATUS", File, 1);
--replace_column 1 #
-RESTORE FROM 'db12.bak' OVERWRITE SKIP_GAP_EVENT;
+RESTORE FROM 'db12.bak' OVERWRITE SKIP_INCIDENT_EVENT;
--echo # Show the incident event is not issued as a result of restore
---echo # with skip_gap_event
+--echo # with skip_incident_event
--replace_column 2 # 5 #
--replace_result $binlog_file <binlog_file> $master_before_pos <master_pos>
eval SHOW BINLOG EVENTS IN '$binlog_file' FROM $master_before_pos;
Attachment: [text/bzr-bundle]
| Thread |
|---|
| • bzr commit into mysql-next-mr-backup branch (ritheesh.vedire:3112)Bug#52207 | Ritheesh Vedire | 19 Mar |
