From: Date: February 1 2008 6:51pm
Subject: bk commit into 5.1 tree (df:1.2521) BUG#25340
List-Archive: http://lists.mysql.com/commits/41577
X-Bug: 25340
Message-Id: <200802011752.m11Hq1Ch022741@mail.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of df.  When df 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@stripped, 2008-02-01 18:51:46+01:00, df@stripped +1 -0
  BUG#25340 Slight error in configure.js break source installation on Windows

  win/configure.js@stripped, 2008-02-01 18:51:40+01:00, df@stripped +2 -0
    BUG#25340 Slight error in configure.js break source installation on Windows
    Added a check for a carriage return at the end of a line.

diff -Nrup a/win/configure.js b/win/configure.js
--- a/win/configure.js	2007-09-21 18:05:50 +02:00
+++ b/win/configure.js	2008-02-01 18:51:40 +01:00
@@ -133,6 +133,8 @@ function GetValue(str, key)
     var end = str.indexOf("\n", pos);
     if (str.charAt(pos) == "\"")
         pos++;
+    if (str.charAt(end-1) == "\r")
+        end--;
     if (str.charAt(end-1) == "\"")
         end--;
     return str.substring(pos, end);