From: Bjorn Munch
Date: April 18 2011 9:49am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2997) Bug#12365486
List-Archive: http://lists.mysql.com/commits/135601
X-Bug: 12365486
Message-Id: <201104180949.p3I9n7sl017496@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1613362484=="

--===============1613362484==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/dbgwrn-51/ based on revid:bjorn.munch@stripped

 2997 Bjorn Munch	2011-04-18
      Bug #12365486 MTR FAILS TO FIND WARNINGS IN SERVER LOG WITH --VALGRIND COMBINED WITH --DEBUG
      With this combination, outoput was directed to .trace but not all
        parts of MTR was aware of this.
      Replace .err with .trace at the earliest possible place

    modified:
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/My/ConfigFactory.pm'
--- a/mysql-test/lib/My/ConfigFactory.pm	2011-01-18 10:03:44 +0000
+++ b/mysql-test/lib/My/ConfigFactory.pm	2011-04-18 09:47:14 +0000
@@ -1,5 +1,5 @@
 # -*- cperl -*-
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -141,7 +141,11 @@ sub fix_tmpdir {
 sub fix_log_error {
   my ($self, $config, $group_name, $group)= @_;
   my $dir= $self->{ARGS}->{vardir};
-  return "$dir/log/$group_name.err";
+  if ( $::opt_valgrind and $::opt_debug ) {
+    return "$dir/log/$group_name.trace";
+  } else {
+    return "$dir/log/$group_name.err";
+  }
 }
 
 sub fix_log {

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-04-15 08:30:52 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-04-18 09:47:14 +0000
@@ -256,7 +256,7 @@ my $opt_strace_client;
 
 our $opt_user = "root";
 
-my $opt_valgrind= 0;
+our $opt_valgrind= 0;
 my $opt_valgrind_mysqld= 0;
 my $opt_valgrind_mysqltest= 0;
 my @default_valgrind_args= ("--show-reachable=yes");
@@ -4544,13 +4544,6 @@ sub mysqld_start ($$) {
   unlink($mysqld->value('pid-file'));
 
   my $output= $mysqld->value('#log-error');
-  if ( $opt_valgrind and $opt_debug )
-  {
-    # When both --valgrind and --debug is selected, send
-    # all output to the trace file, making it possible to
-    # see the exact location where valgrind complains
-    $output= "$opt_vardir/log/".$mysqld->name().".trace";
-  }
   # Remember this log file for valgrind error report search
   $mysqld_logs{$output}= 1 if $opt_valgrind;
   # Remember data dir for gmon.out files if using gprof


--===============1613362484==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/dbgwrn-51/
# testament_sha1: c1b0a1a150bcceb4eb9157b16c0e434e42d234b0
# timestamp: 2011-04-18 11:49:07 +0200
# base_revision_id: bjorn.munch@stripped\
#   f7xdg5uwol4hs42v
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTidGQUAAmNfgEAQXGf//3/n
n4C////6UAWB5zt0aVu223WUC7d2hKIQCYQanqbRqYo8NEaaTQPTUaPSNPTUeoJU1MQmmxMpPSHq
NGmjQNAABoAABKEU9TxU9Tanqek9TTRiAAANAMgA0BxkyZMRiYATJgmQA0YRgCGASSCKeBPSMTQK
eTCGhT9UMmj1AAAaML16s6TYW/n0/xViq6EnGMcGN/qWW2+iPKJwsIS+7I1rnNlpEaJ+jz+9nr+O
Ub/gT8ceU4mpFBVSbt9ActxlxSmlmxjMdrCwzMjxDI2Mu9nwt8vLgy7ipo4PxGflVmsGqovcpZ69
NMGd4iihmeeIHPvuTYoNqvR4HRxdkhXbLtyT8pvfk7yyaU6KT4vBekVifAcGfyc7pxeWgXFySg/4
Gc6hDV7tpE3QIU0GJPrMoaRLM1aAoTx/qOIQgaijUTJRVBVrWplBBS+Ki0HCOGFBJj7VIwWKPIGA
eM1pQcBMIpOiRF7PQjBgffi2OZGA8Eul/NWKU1Fsn4yA4zUWWOmfAvAe4P7VIfUKXBPWPk6o0OnI
j/ntgBPPpvM7xiBWVGMi00YxjENIG8CZKR8JHA2VWIIxpyVCcpfSqEivQIXaPYrHw6ZqG1lGOQYj
zK6PqXm9+A1p0JFl9+keWVEtEQKaJAOrHsPQwqRgHLTxCI9qCBEwfeBM+uNsICa9SLTnWEOAf8SJ
s1tjFSHDXFhtgEB8L6kYvGVUUUxWhVcMNakiaZlMoWSSfScqoSCLQ15SiuU/Gaa9yKnrv6GGBOU0
5igCwhacm4HgBOXa9TGL7NAbCd1BuCzNQTWMMzIJGTwbFTZS0VFFjZqnHdXnAlBqCDXzEAJWFiqq
aa8iVRMA6VDjvKGrYKgsfC5o2OXQi8GnaKoRP3NDwJdVhvkquBBz3A0/Uy8hE9PbnLDKKKovL1Oo
euLvHa/rE6TfAdvPh7QczlBwwa36SEM02RkIynmtOrXzk6863CQt4uWUPSOLEppoi9vQd2F4mCLE
ejHYY5HxeT9j2VTJLd7wrlbFHsfGFwVReWnj0lRJFYOeWJYvk7DT4lAsO6omO7b8a52obh5FGc44
qOu6H8dZh10D5qMZlKEOyT74Bc2oMqImrlESmreM8yagYpGdldyvJjaWufOEJg3PJkUlc58tOyyb
EMycC/BJb/JjBq8zYo+wtXrzvNES8KZCkei0b9TYForIjPXgHFMcWZCZY5R4aGjK251+TcePbYi7
mysYi/yYc5V5ShufhuY9BlZxdjiwsajFGonXK1Bz2UkuhTpC0xGg2+UDhwVa8dq9TeaCbkBF5Seh
oNoVVCYLzyyOp067NTN+4yS3iuhJlSGs17UrW0imOe+4r3j7N/ohpUQ19aY0iKBiI+PUvdyC0bcl
Tc8V9CVKzUh4faeqAvxjTLeep9OAl2y1bxt+3cjn4kiS5SCIZ0RiQBim4zOEnGp7i3oOs3vPbd4+
8YCRbcEpKCFzA9QHXFicWBxkVm39SbCeddhLjh22BVYWNUzMJPTjqMpziTRrYSZzMLsTA7zpkd2Q
osDLLHDNMZGPgGRkkqWZOZd/3wKDWdq47vkJPRmWdJe54m4m3Ks4YYAYchathuJr2GBplTjQd66E
256ufTTQFnYB3A+Y5Dbl7YoIKTKTowwp5vogVwQKiUdC7W1JNOduwhkSkWpREpjZbJnScY044pD3
CM+pWHuXnB152CtlkpaR7kOJw1eh4MzeeKKszIqQw8c8tzOwte7m82jMLBmIFk6178aLbUVcCYSa
1Br32C7tknhBREgpMiK0lkvq4G0jxPuy27gKTXInlrESokXCR4r7tgYaDvOfJWtisBeZ3bFsDPRe
+Vx1CnE73IulUyJznQBUWMfQ0jUSoBbzsFPYPLo7yWejf4GEP+LuSKcKEgcToyCg


--===============1613362484==--