1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#28388217 - SERVER CAN FAIL WHILE REPLICATING CONDITIONAL COMMENTS

Browse Source 
Cause:
In case of version based condtional comments, if the condition evaluates
to false, it is converted to a regular comment for replication by
replacing "!"  by " ".

Nested comment in a conditional comment is replicated as is. Nested
comments are supported only in case of conditional comments and when a
the comment on slave is no more a conditional comment, the statement
execution fails on the slave.

Fix:
Convert the nested comment, start from "/*" to "(*" and comment end from
"*/" to "*)" for replication.

Change-Id: I1a8e385a267b2370529eade094f0258fa96886c0
This commit is contained in:
Maheedhar PV 2019-11-26 09:39:35 +05:30 committed by Sergei Golubchik
parent a13157a561
commit 4d1de554bb
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_lex.cc
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. /* Copyright (c) 2000, 2019, Oracle and/or its affiliates.
Copyright (c) 2009, 2018, MariaDB Corporation Copyright (c) 2009, 2020, MariaDB Corporation
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -940,17 +940,27 @@ static inline uint int_token(const char *str,uint length)
*/ */
bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted) bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted)
{ {
// only one level of nested comments are allowed
DBUG_ASSERT(remaining_recursions_permitted == 0 ||
remaining_recursions_permitted == 1);
reg1 uchar c; reg1 uchar c;
while (! lip->eof()) while (! lip->eof())
{ {
c= lip->yyGet(); c= lip->yyGet();
if (remaining_recursions_permitted > 0) if (remaining_recursions_permitted == 1)
{ {
if ((c == '/') && (lip->yyPeek() == '*')) if ((c == '/') && (lip->yyPeek() == '*'))
{ {
lip->yyUnput('('); // Replace nested "/*..." with "(*..."
lip->yySkip(); // and skip "("
lip->yySkip(); /* Eat asterisk */ lip->yySkip(); /* Eat asterisk */
consume_comment(lip, remaining_recursions_permitted-1); if (consume_comment(lip, 0))
return true;
lip->yyUnput(')'); // Replace "...*/" with "...*)"
lip->yySkip(); // and skip ")"
continue; continue;
} }
} }