maria-developers team mailing list archive

[Sergey Petrunya <psergey@xxxxxxxxxxxx>]

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/

------------------------------------------------------------
revno: 2746
revision-id: psergey@xxxxxxxxxxxx-20090917001350-pyxja2suxylxhez1
parent: psergey@xxxxxxxxxxxx-20090916190503-kgckwua1roxhonsy
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: mysql-5.1-maria-contd4
timestamp: Thu 2009-09-17 04:13:50 +0400
message:
  Fix mysql-test-run on windows:
  - Make it not to add '--console' when '--log-error' option is present
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-09-15 10:46:35 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-09-17 00:13:50 +0000
@@ -4433,7 +4433,9 @@
   if (IS_WINDOWS)
   {
     # Trick the server to send output to stderr, with --console
-    mtr_add_arg($args, "--console");
+    if (!(join(' ', @$args) =~ /--log-error/)) {
+      mtr_add_arg($args, "--console");
+    }
   }
 
   if ( $opt_gdb || $opt_manual_gdb )
@@ -5056,7 +5058,9 @@
     if (IS_WINDOWS)
     {
       # Trick the server to send output to stderr, with --console
-      mtr_add_arg($args, "--server-arg=--console");
+      if (!(join(' ', @$args) =~ /--log-error/)) {
+        mtr_add_arg($args, "--server-arg=--console");
+      }
     }
   }