diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index f680ed909b2..5ae5684d14c 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1189,9 +1189,19 @@ sub check_mysqld_features () {
 	}
 	else
 	{
-	  # The variable list is ended with a blank line, so when a line
-	  # doesn't match the above regex, break the loop
-	  last;
+	  # The variable list is ended with a blank line
+	  if ( $line =~ /^[\s]*$/ )
+	  {
+	    last;
+	  }
+	  else
+	  {
+	    # Send out a warning, we should fix the variables that has no
+	    # space between variable name and it's value
+	    # or should it be fixed width column parsing? It does not
+	    # look like that in function my_print_variables in my_getopt.c
+	    mtr_warning("Could not parse variable list line : $line");
+	  }
 	}
       }
     }