From: Date: February 16 2006 12:54am
Subject: bk commit into 5.0 tree (msvensson:1.2049) BUG#13809
List-Archive: http://lists.mysql.com/commits/2698
X-Bug: 13809
Message-Id: <20060215235401.99748207825@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2049 06/02/16 00:53:55 msvensson@neptunus.(none) +1 -0
  Bug#13809 mysql-test: --replace_result option works on Windows incorrect

  client/mysqltest.c
    1.201 06/02/16 00:53:51 msvensson@neptunus.(none) +7 -1
    Convert cr/lf to lf

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug13809/my50-bug13809

--- 1.200/client/mysqltest.c	2006-02-02 11:46:53 +01:00
+++ 1.201/client/mysqltest.c	2006-02-16 00:53:51 +01:00
@@ -2517,9 +2517,15 @@
       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: