summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorDeepthi Eranti_Sreenivas <deepthi.e.s@oracle.com>2016-01-22 16:51:21 +0530
committerDeepthi Eranti_Sreenivas <deepthi.e.s@oracle.com>2016-01-22 16:51:21 +0530
commit1624c26d429171c33ad33613e73bba23a5a3cbdd (patch)
tree7d156c980919e181f19c139e226484581fac754f /mysql-test
parent7d19d4b2dd692deb38d230e64d3c4c3b64570ad6 (diff)
downloadmariadb-git-1624c26d429171c33ad33613e73bba23a5a3cbdd.tar.gz
Bug#22086528: TEST CODE DISABLED THOUGH THE HISTORIC REASONS - BUGS - ARE FIXED
Post push fix for 5.5 and 5.6.Disabled the test code due to Bug#22587377
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/rpl/r/rpl_killed_ddl.result4
-rw-r--r--mysql-test/suite/rpl/t/rpl_killed_ddl.test9
2 files changed, 6 insertions, 7 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_killed_ddl.result b/mysql-test/suite/rpl/r/rpl_killed_ddl.result
index 4d9f8b77735..ed8745ca2c1 100644
--- a/mysql-test/suite/rpl/r/rpl_killed_ddl.result
+++ b/mysql-test/suite/rpl/r/rpl_killed_ddl.result
@@ -71,10 +71,6 @@ ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 DAY
DO INSERT INTO test.t1 VALUES (2);
source include/kill_query.inc;
include/rpl_diff.inc
-ALTER EVENT e1
-ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 2 DAY;
-source include/kill_query.inc;
-include/rpl_diff.inc
DROP EVENT e1;
source include/kill_query.inc;
include/rpl_diff.inc
diff --git a/mysql-test/suite/rpl/t/rpl_killed_ddl.test b/mysql-test/suite/rpl/t/rpl_killed_ddl.test
index 76e9b3af091..e9f5a5c47c2 100644
--- a/mysql-test/suite/rpl/t/rpl_killed_ddl.test
+++ b/mysql-test/suite/rpl/t/rpl_killed_ddl.test
@@ -27,6 +27,7 @@
# There are some part of the test are temporarily disabled because of
# the following bugs, please enable then once they get fixed:
# - BUG#22473427
+# - Bug#22587377
source include/have_debug.inc;
source include/master-slave.inc;
@@ -163,9 +164,11 @@ send CREATE EVENT e2
DO INSERT INTO test.t1 VALUES (2);
source include/kill_query_and_diff_master_slave.inc;
-send ALTER EVENT e1
- ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 2 DAY;
-source include/kill_query_and_diff_master_slave.inc;
+# Temporarily disabled,see Bug#22587377-RPL.RPL_KILLED_DDL
+# FAILS SPORADICALLY ON PB2 IN 5.5 AND 5.6
+#send ALTER EVENT e1
+# ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 2 DAY;
+#source include/kill_query_and_diff_master_slave.inc;
send DROP EVENT e1;
source include/kill_query_and_diff_master_slave.inc;