bk commit into 4.1 tree (msvensson:1.2598)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 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@stripped, 2006-10-23 20:34:39+02:00, msvensson@neptunus.(none) +1 -0
  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@stripped, 2006-10-23 20:34:38+02:00, msvensson@neptunus.(none) +2 -2
    Avoid matching the trailing carriage return when parsing the mysqld.spec file

# 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/mysql-4.1-maint

--- 1.126/mysql-test/mysql-test-run.pl	2006-10-23 20:34:43 +02:00
+++ 1.127/mysql-test/mysql-test-run.pl	2006-10-23 20:34:43 +02:00
@@ -1269,9 +1269,9 @@
       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