From 145b1fe1f9e1327d076a0f5dd9732b93b65dd7b0 Mon Sep 17 00:00:00 2001
From: Bjorn Munch <Bjorn.Munch@sun.com>
Date: Mon, 14 Jun 2010 15:34:43 +0200
Subject: [PATCH] Bug #54368 MTR does not recognize carriage return in
 --defaults-file Remove any leftover trailing ^M from lines read in

---
 mysql-test/lib/My/Config.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/lib/My/Config.pm b/mysql-test/lib/My/Config.pm
index f8416e3df3a..315e415e219 100644
--- a/mysql-test/lib/My/Config.pm
+++ b/mysql-test/lib/My/Config.pm
@@ -188,6 +188,8 @@ sub new {
 
   while (  my $line= <$F> ) {
     chomp($line);
+    # Remove any trailing CR from Windows edited files
+    $line=~ s/\cM$//;
 
     # [group]
     if ( $line =~ /^\[(.*)\]/ ) {