database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Auto-merge from mysql-5.5.

Browse Source
This commit is contained in:
Alexander Nozdrin
2010-08-18 11:48:38 +04:00
parent 932285774b 8c4d4cc3a6
commit e28d6ee66a
54 changed files with 530 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_lex.cc
View File

@ -1439,8 +1439,6 @@ int lex_one_token(void *arg, void *yythd)
}
else
{
const char* version_mark= lip->get_ptr() - 1;
DBUG_ASSERT(*version_mark == '!');
/*
Patch and skip the conditional comment to avoid it
being propagated infinitely (eg. to a slave).
@ -1449,7 +1447,6 @@ int lex_one_token(void *arg, void *yythd)
comment_closed= ! consume_comment(lip, 1);
if (! comment_closed)
{
DBUG_ASSERT(pcom == version_mark);
*pcom= '!';
}
/* version allowed to have one level of comment inside. */