Merge branch '2.1' into develop

This commit is contained in:
Johan Wikman
2017-08-15 10:31:30 +03:00
12 changed files with 24 additions and 24 deletions

View File

@ -762,7 +762,7 @@ char* strnchr_esc(char* ptr, char c, int len)
char* p = (char*)ptr;
char* start = p;
bool quoted = false, escaped = false;
char qc;
char qc = 0;
while (p < start + len)
{
@ -808,7 +808,7 @@ char* strnchr_esc_mysql(char* ptr, char c, int len)
char* p = (char*) ptr;
char* start = p, *end = start + len;
bool quoted = false, escaped = false, backtick = false, comment = false;
char qc;
char qc = 0;
while (p < end)
{