summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl4
1 files 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