From f9ff7472a23d97cc7235b5396191b02aad37fc21 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Mon, 23 Oct 2006 20:36:44 +0200
Subject: [PATCH] Avoid matching the trailing carriage return when parsing the
 mysqld.spec file This fixes problem where --replace_result failed in
 rpl000015 because the MYSQL_TCP_PORT variable was "3306\r"

mysql-test/mysql-test-run.pl:
  Avoid matching the trailing carriage return when parsing the mysqld.spec file
---
 mysql-test/mysql-test-run.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 84d84cf8f14..7f1f7a43b10 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1269,9 +1269,9 @@ sub collect_mysqld_features () {
       else
       {
 	# Put variables into hash
-	if ( $line =~ /^([\S]+)[ \t]+(.*)$/ )
+	if ( $line =~ /^([\S]+)[ \t]+(.*?)\r?$/ )
 	{
-	  # print "$1=$2\n";
+	  # print "$1=\"$2\"\n";
 	  $mysqld_variables{$1}= $2;
 	}
 	else