merge 54368

d8432094 · Bjorn Munch · 33795a70 · 145b1fe1 · d8432094
Commit d8432094 authored Jun 15, 2010 by Bjorn Munch
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

mysql-test/lib/My/Config.pm mysql-test/lib/My/Config.pm +2 -0

No files found.
--- 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 =~ /^\[(.*)\]/ ) {