database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

merge

Browse Source 
client/mysql.cc:
  Auto merged
libmysql/libmysql.c:
  I commited this change 2 weeks ago. 
  I am still waiting for approval to push.
  
  Someone meanwhile pushed different commit, so this merge commit.
This commit is contained in:
unknown
2003-02-13 15:16:00 +02:00
parent efcf8b57c7 2d2f444da6
commit 802fe52548
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql.cc
View File

@@ -1036,7 +1036,7 @@ static bool add_line(String &buffer,char *line,char *in_string,
inchar == '-' && pos[1] == '-' &&
my_isspace(system_charset_info,pos[2]))))
break; // comment to end of line
else if (!*in_string && inchar == '/' && *(pos+1) == '*')
else if (!*in_string && inchar == '/' && *(pos+1) == '*' && *(pos+2) != '!')
{
pos++;
*ml_comment= 1;