BUG#26121192 : --NO-CONSOLE IS COMPULSORY IF --LOG-ERROR USED TO MAKE

               WINDOWS RUN PASS

Issue:
------
MTR adds '--console' option if '--no-console' options is not specified.
But adding '--console' option when '--log-error' is specified either in
test-[master/slave].opt or in the config file will cause the test run
to fail on windows.

Fix:
----
On windows, don't add '--console' option if '--log-error' is specified
either in test-[master/slave].opt or in the test config file. This patch
is a back-port of bug#20341933.

Reviewed-by: Deepa Dixit <deepa.dixit@oracle.com>
RB: 16372

Author: Pavan Naik

mysql-test/mysql-test-run.pl

@@ -5201,13 +5201,26 @@ ($$$)
   my $found_skip_core= 0;
   my $found_no_console= 0;
   my $found_log_error= 0;
+
+  # On windows, do not add console if log-error found in .cnf file
+  open (CONFIG_FILE, " < $path_config_file") or
+    die("Could not open output file $path_config_file");
+
+  while (<CONFIG_FILE>)
+  {
+    if (m/^log[-_]error/)
+    {
+      $found_log_error= 1;
+    }
+  }
+  close (CONFIG_FILE);
+
   foreach my $arg ( @$extra_opts )
   {
     # Skip --defaults-file option since it's handled above.
     next if $arg =~ /^--defaults-file/;
-   
 
-    if ($arg eq "--log-error")
+    if ($arg =~ /^--log[-_]error/)
     {
       $found_log_error= 1;
     }