summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2008-03-27 13:21:34 +0100
committerunknown <joerg@trift2.>2008-03-27 13:21:34 +0100
commit0db1f520c629455b4766c3d8f57a9767d7f6a98f (patch)
tree55e92b376618eb75de33060b26d0176caff2c4a1
parent9878e861a2aba444f759d30baaeceb189bdec12a (diff)
parent5a6b357e6ff9379b68914048bdac50275f994749 (diff)
downloadmariadb-git-0db1f520c629455b4766c3d8f57a9767d7f6a98f.tar.gz
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into trift2.:/MySQL/M50/push-5.0
-rwxr-xr-xwin/configure.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/win/configure.js b/win/configure.js
index 4450b97f9a1..0de09fb318c 100755
--- a/win/configure.js
+++ b/win/configure.js
@@ -134,6 +134,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);