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

merge

Browse Source
This commit is contained in:
Georgi Kodinov 2009-11-20 12:11:31 +02:00
commit a889a83395
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extra/comp_err.c
View File

@ -660,7 +660,7 @@ static ha_checksum checksum_format_specifier(const char* msg)
case 'u': case 'u':
case 'x': case 'x':
case 's': case 's':
chksum= my_checksum(chksum, start, (uint) (p - start)); chksum= my_checksum(chksum, start, (uint) (p + 1 - start));
start= 0; /* Not in format specifier anymore */ start= 0; /* Not in format specifier anymore */
break; break;
@ -1030,8 +1030,10 @@ static char *parse_text_line(char *pos)
{ {
int i, nr; int i, nr;
char *row= pos; char *row= pos;
size_t len;
DBUG_ENTER("parse_text_line"); DBUG_ENTER("parse_text_line");
len= strlen (pos);
while (*pos) while (*pos)
{ {
if (*pos == '\\') if (*pos == '\\')
@ -1039,11 +1041,11 @@ static char *parse_text_line(char *pos)
switch (*++pos) { switch (*++pos) {
case '\\': case '\\':
case '"': case '"':
VOID(strmov(pos - 1, pos)); VOID(memmove (pos - 1, pos, len - (row - pos)));
break; break;
case 'n': case 'n':
pos[-1]= '\n'; pos[-1]= '\n';
VOID(strmov(pos, pos + 1)); VOID(memmove (pos, pos + 1, len - (row - pos)));
break; break;
default: default:
if (*pos >= '0' && *pos < '8') if (*pos >= '0' && *pos < '8')
@ -1053,10 +1055,10 @@ static char *parse_text_line(char *pos)
nr= nr * 8 + (*(pos++) - '0'); nr= nr * 8 + (*(pos++) - '0');
pos -= i; pos -= i;
pos[-1]= nr; pos[-1]= nr;
VOID(strmov(pos, pos + i)); VOID(memmove (pos, pos + i, len - (row - pos)));
} }
else if (*pos) else if (*pos)
VOID(strmov(pos - 1, pos)); /* Remove '\' */ VOID(memmove (pos - 1, pos, len - (row - pos))); /* Remove '\' */
} }
} }
else else