Commit 8e9d5356 authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)

Merge neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents dc41ef5f 3d1f99f8
......@@ -2921,10 +2921,16 @@ int read_line(char *buf, int size)
continue;
}
/* Line counting is independent of state */
if (c == '\n')
{
/* Line counting is independent of state */
cur_file->lineno++;
/* Convert cr/lf to lf */
if (p != buf && *(p-1) == '\r')
*(p-1)= 0;
}
switch(state) {
case R_NORMAL:
/* Only accept '{' in the beginning of a line */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment