At file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/
------------------------------------------------------------
revno: 2749
revision-id: psergey@askmonty.org-20090918005527-k589m56f8q89zwol
parent: psergey@askmonty.org-20090917230109-mni2vfp5mtgxpbhw
committer: Sergey Petrunya
branch nick: mysql-5.1-maria-contd4
timestamp: Fri 2009-09-18 04:55:27 +0400
message:
Fix mysql-test-run on windows:
Make it not to add '--console' when '--log-error' option is present
- Review feedback
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl 2009-09-17 00:13:50 +0000
+++ b/mysql-test/mysql-test-run.pl 2009-09-18 00:55:27 +0000
@@ -4433,7 +4433,7 @@
if (IS_WINDOWS)
{
# Trick the server to send output to stderr, with --console
- if (!(join(' ', @$args) =~ /--log-error/)) {
+ if (!(grep(/^--log-error/, @$args))) {
mtr_add_arg($args, "--console");
}
}
@@ -5058,7 +5058,7 @@
if (IS_WINDOWS)
{
# Trick the server to send output to stderr, with --console
- if (!(join(' ', @$args) =~ /--log-error/)) {
+ if (!(grep(/^--server-arg=--log-error/, @$args))) {
mtr_add_arg($args, "--server-arg=--console");
}
}
Sergey Petrunya