Commit d736de57 authored by unknown's avatar unknown
Browse files

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
parents 5c77e47a 5854239d

client/mysqltest.c

+7 −1
Original line number Diff line number Diff line
@@ -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 */