summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl/t/rpl_conditional_comments.test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-05-27 23:10:55 +0200
committerSergei Golubchik <serg@mariadb.org>2020-05-27 23:10:55 +0200
commitc2a7dffc573f311029ed4696fb5bd88e5efba752 (patch)
tree9f04258d84a42954afb0b8e36486fd6f303cf90d /mysql-test/suite/rpl/t/rpl_conditional_comments.test
parent520c3f69a6caed5524d3214a0339736d673c4c0c (diff)
parentf20c63264ab4170fc8e45093042bd2e7272ce9fc (diff)
downloadmariadb-git-10.0.tar.gz
Merge tag 'mariadb-5.5.68' into 10.0bb-10.0-serg10.0
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_conditional_comments.test')
-rw-r--r--mysql-test/suite/rpl/t/rpl_conditional_comments.test12
1 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_conditional_comments.test b/mysql-test/suite/rpl/t/rpl_conditional_comments.test
index bcc964a92c7..6e4ec8745f4 100644
--- a/mysql-test/suite/rpl/t/rpl_conditional_comments.test
+++ b/mysql-test/suite/rpl/t/rpl_conditional_comments.test
@@ -68,7 +68,17 @@ sync_slave_with_master;
--echo # comments
--connection master
--error 1064
-SELECT c1 FROM /*!999999 t1 WHEREN;
+SELECT c1 FROM /*!999999 t1 WHEREN; #*/
+
+#
+# Bug#28388217 - SERVER CAN FAIL WHILE REPLICATING CONDITIONAL COMMENTS
+#
+insert t1 values (/*!50505 1 /* foo */ */ + 2);
+insert t1 values (/*!999999 10 /* foo */ */ + 20);
+source include/show_binlog_events.inc;
+sync_slave_with_master;
+select * from t1;
+connection master;
DROP TABLE t1;
--source include/rpl_end.inc