database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Avoid matching the trailing carriage return when parsing the mysqld.spec file

Browse Source 
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
This commit is contained in:
unknown
2006-10-23 20:36:44 +02:00
parent 13c55f3c17
commit f9ff7472a2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.pl
View File

@ -1269,9 +1269,9 @@ sub collect_mysqld_features () {
else else
{ {
# Put variables into hash # 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; $mysqld_variables{$1}= $2;
} }
else else