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

Fixed a bug in comment handling.

Browse Source
This commit is contained in:
jani@rhols221.adsl.netsonic.fi
2003-03-21 14:14:36 +02:00
parent 2a410e95db
commit 3d090552da
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/mysql.cc
View File

@@ -40,7 +40,7 @@
#include <signal.h> #include <signal.h>
#include <violite.h> #include <violite.h>
const char *VER= "12.19"; const char *VER= "12.20";
/* Don't try to make a nice table if the data is too big */ /* Don't try to make a nice table if the data is too big */
#define MAX_COLUMN_LENGTH 1024 #define MAX_COLUMN_LENGTH 1024
@@ -919,6 +919,7 @@ static bool add_line(String &buffer,char *line,char *in_string)
uchar inchar; uchar inchar;
char buff[80],*pos,*out; char buff[80],*pos,*out;
COMMANDS *com; COMMANDS *com;
my_bool in_comment= 0;
if (!line[0] && buffer.is_empty()) if (!line[0] && buffer.is_empty())
return 0; return 0;
@@ -978,7 +979,7 @@ static bool add_line(String &buffer,char *line,char *in_string)
continue; continue;
} }
} }
else if (inchar == ';' && !*in_string) else if (inchar == ';' && !*in_string && !in_comment)
{ // ';' is end of command { // ';' is end of command
if (out != line) if (out != line)
buffer.append(line,(uint) (out-line)); // Add this line buffer.append(line,(uint) (out-line)); // Add this line
@@ -1009,6 +1010,13 @@ static bool add_line(String &buffer,char *line,char *in_string)
else if (!*in_string && (inchar == '\'' || inchar == '"')) else if (!*in_string && (inchar == '\'' || inchar == '"'))
*in_string=(char) inchar; *in_string=(char) inchar;
*out++ = (char) inchar; *out++ = (char) inchar;
if (inchar == '*' && !*in_string)
{
if (pos != line && pos[-1] == '/')
in_comment= 1;
else if (in_comment && pos[1] == '/')
in_comment= 0;
}
} }
} }
if (out != line || !buffer.is_empty()) if (out != line || !buffer.is_empty())