Commit e4df2aac authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)
Browse files

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"
parent 792adb7c

mysql-test/mysql-test-run.pl

+2 −2
Original line number Diff line number Diff line
@@ -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