From: Bjorn Munch
Date: August 6 2010 9:36am
Subject: bzr commit into mysql-5.1-bugteam branch (bjorn.munch:3477) Bug#55503
List-Archive: http://lists.mysql.com/commits/115167
X-Bug: 55503
Message-Id: <201008060936.o769aG54013495@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1113572879=="

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

#At file:///home/bm136801/my/mysql-5.1-bugteam/ based on revid:bjorn.munch@stripped

 3477 Bjorn Munch	2010-08-06
      Bug #55503 MTR fails to filter LEAK SUMMARY from valgrind report of restarted servers
      Undo workaround as fix is being merged in

    modified:
      mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
      mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
=== modified file 'mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test'
--- a/mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test	2010-07-30 14:09:24 +0000
+++ b/mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test	2010-08-06 09:35:17 +0000
@@ -1,8 +1,6 @@
 -- source include/have_innodb_plugin.inc
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
-# remove the next line after bug #55503 is fixed
--- source include/not_valgrind.inc
 
 let $innodb_file_format_check_orig=`select @@innodb_file_format_check`;
 

=== modified file 'mysql-test/suite/innodb_plugin/t/innodb-autoinc.test'
--- a/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test	2010-07-30 14:09:24 +0000
+++ b/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test	2010-08-06 09:35:17 +0000
@@ -1,8 +1,6 @@
 -- source include/have_innodb_plugin.inc
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
-# remove the next line after bug #55503 is fixed
--- source include/not_valgrind.inc
 
 let $innodb_file_format_check_orig=`select @@innodb_file_format_check`;
 


--===============1113572879==
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/mysql-5.1-bugteam/
# testament_sha1: de3ad118bd06deadc65cf7ff82939d548fec38d1
# timestamp: 2010-08-06 11:36:16 +0200
# source_branch: file:///home/bm136801/my/mtr-51/
# base_revision_id: bjorn.munch@stripped\
#   88odvg2cui0qj3o8
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWU1V0akAAjrfgAAQWmP/93MO
HiC////wUAS+5LsBb17xk6RsQ0qHqNAMh6IDAEbIIAYAGlMUemp+ppHlPUAaAANAAAAlBBDRU/Qp
+mgiPUaPSP0oaPIQ9DSBIqJpkZTxTJmkwg8UNNqaAA0HqCSSYUwaE0yAypvVPUamnlMnqPUaNHpN
K7OK/jE+xDNlgTy+1aOAyPrxNz3xm6HpHA+ZYMwwWcknfGajjKxmuYZuXNq+3jo4cjU/j68Znrji
YXsR/bIyhZztw91Yah8TO/BB1QPhIPIKA+V4Xn9L0E1Tg/y8NlQK6kPM0u93XECsKzwzfmJbFQK+
Aw0DgPqkWwgkYXu2Tklg8ArCh41u5WD5BSMiDoJKJ8kvGGAYYHSMXLGhkGZIkaXIkSzhNSIinZJA
WmpDEqWBKI6qYkvQ4rIkgFjwAfArzaIdvDMCdp45We47ylhiRGBxmY0HHHU1AmB2lYGnZJW8jCR+
ueQ2iwKgychx9AXbxVvsbHRiASOPNzZYRQ4vAtXW55aEiCzJBgUDgqnB3+qRZUrikUTqOje6pHJT
KCyPbeQhAG2TD5BgTDCu8aFN1AHRlVSOt8Ffu9HAYvGDsTutvDyIlQHsBGb0jIxoLis114dyTC4b
8QyDkuZAZUIGLbBzxXGUTGQUOKn1BzOJvNx+AKyy4prB3QJpHOvQDw2OVSBCwwzJwQDQt85QLGFP
jAMGKwiIiMBRUXVMOUKyEyupdNUBwjIHxWUsBpsyLBQWa4FIjDG6vFbs2VvGZCCEZp1F0pMfxtBf
HCeVtNuH8HlCoE56KujHSDQ6U/lZhiMh45nBQ2qfGOwOojn6w0ObEXyYEUQ0oGwxAzKThQ+QhlzE
Xs3J0kgkQhAGALgdMsvjCBeczz6onuX5FSYd7fgci/3pchYBqXmB5hscR9ETIGJGoQCgzHlr/WwS
1YNHMJeolHuodRm9THvGM512gVBuCwc9HoBLga8Q1xA120gDdiWFtrB+itQDwbjWL2Gj6m82dZuV
qFENOUmH1O+vX7Hant3TNF2ZT0UyTgiheLPZg1u6e1sA2xkIalx4DkORR1rDoX9zsP0PlyDVTXia
EA6sd2mO+L+KrFjAY2j3PePGQuYouDYkWrQpXM+BmlzuYpnvQ49CqFkcJmMwsVyKeJXlzHKX6dEf
Ki0LeqOJtvidPqvgfoPA+nkC2NQOWiPmVI5hSixwdykSYNaxst7yk3aJK1SWXGRlGD1cC4DuwdiQ
xyME9oFxApiIVEzBMHAL1igK2BYAzOJsGtdlfasIFpTvVFZILBsSUqLITgJRInLaFnQt5EsslJKG
yjUxhAsM2KqLcBcrUvsj1tYkgb0HRLSveySkbxu37wQDDGGek5MzKqacIfSIV53XTZbWFKGHASNm
MUtyFJDFA6krscByoY+wUEh2+NpdV8hTCgvBrMN0yHMU0XBBgcWcDf5cvBRIfzoCm+4TiditsWaN
5kVEr+5FG5aEUtQLppkE/+LuSKcKEgmqujUg


--===============1113572879==--