diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 6f212f784ef..da6a670c4ed 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -2517,10 +2517,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 */ |