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

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

client/mysqltest.c

@@ -2875,10 +2875,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 */