From 3fc22ca4b9702e5e4708c63b51e76e1ed141e20e Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Thu, 16 Feb 2006 00:53:55 +0100
Subject: [PATCH] Bug#13809 mysql-test: --replace_result option works on
 Windows incorrect

---
 client/mysqltest.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 */