mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
Merge neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809
into neptunus.(none):/home/msvensson/mysql/mysql-5.1 client/mysqltest.c: Auto merged
This commit is contained in:
commit
d736de57ca
1 changed files with 7 additions and 1 deletions
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue