diff options
| author | msvensson@neptunus.(none) <> | 2006-02-21 09:11:59 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-02-21 09:11:59 +0100 |
| commit | 8e9d5356762631b55634ed94d2fd4b378c27625d (patch) | |
| tree | a0114e6b239c935f90693c0dc76a1d2f4c12eda7 | |
| parent | dc41ef5f463e0f17488b5f453545047cfb5cec6d (diff) | |
| parent | 3d1f99f8f9ab7468faac4969b0ad7a108a38a4e1 (diff) | |
| download | mariadb-git-8e9d5356762631b55634ed94d2fd4b378c27625d.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
| -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 ec57fb7c655..94b5171be6a 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -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 */ |