diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-16 00:53:55 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-16 00:53:55 +0100 |
| commit | 802fa357b49ce7fe3fd4e0435ca168c8f6b4fab0 (patch) | |
| tree | 05d47ed00ca9933acb167edae6d9c26bb0e301d0 /client | |
| parent | 7b31775ed5ffae63b019394c7cbad16bef1b5e67 (diff) | |
| download | mariadb-git-802fa357b49ce7fe3fd4e0435ca168c8f6b4fab0.tar.gz | |
Bug#13809 mysql-test: --replace_result option works on Windows incorrect
client/mysqltest.c:
Convert cr/lf to lf
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 */ |