From: Bjorn Munch
Date: January 18 2011 11:11am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2972)
List-Archive: http://lists.mysql.com/commits/129066
Message-Id: <201101181111.p0IBBwMd019248@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1343016536=="

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

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

 2972 Bjorn Munch	2011-01-18
      oops forgot one file in last commit

    modified:
      mysql-test/lib/mtr_gprof.pl
=== modified file 'mysql-test/lib/mtr_gprof.pl'
--- a/mysql-test/lib/mtr_gprof.pl	2010-01-05 20:35:50 +0000
+++ b/mysql-test/lib/mtr_gprof.pl	2011-01-18 11:11:52 +0000
@@ -1,5 +1,5 @@
 # -*- cperl -*-
-# Copyright (C) 2004 MySQL AB
+# Copyright (C) 2004 MySQL AB, 2009 Sun Microsystems, Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


--===============1343016536==
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/mtr-51/
# testament_sha1: 3a8e47309a06a0c1e224369c4265391855d5bb6a
# timestamp: 2011-01-18 12:11:58 +0100
# base_revision_id: bjorn.munch@stripped\
#   4gda1g7gcil574gk
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWctAz5EAAWPfgEAQWGf/93om
KAC////wUAN1hhd570b17bgkogTT1GjRqbRo0yniEepo0aaGg0GkAJiaanlPU0GkNAaAABkCSTRM
Qk02U9U9NNqT00QepoYGhAYYpDRDTQaD1GmgAAAAAJJTUnptBTyn6oaZij1Mmyh5Q0ABkgCwxgb1
pvGerS0YWiAEJshxzx+lT34gxe3kSFmWZ0cTyQMg5b9UTiGV0x9c/71fwZ4urUadPxhzRv701iKK
y6+/M4+RFy07RdRjjxMs9deO+FtchDJFVjCkRxbs11u9A2NayB0LaQddseSsWTqyA77GFVLpi6Cj
KGsx7IiigooCYW50ErJWlJculuaV+2xcVD2u5pFDhoQZ1NU4jorfHBnIrCWJIU4fcZhDuaoELmRB
vEItiLHRZLKXapwlXXtzRcXGVRFRUMTwgaVJPoDKDYHtSygBkjYG/kxljqKpNDMHtyg3wBSQJtWU
sDkbhGqOFXGsk08hfok9kby30FARtuwIDMwRYkOcShFMOBGSYgN14VLa5d1QcOaNVlArhFeklQzx
KAhyAn3LuOHHCwtfW0dEFhN002kUCdGv+x9NVdeLsbvLhwSLfSdzBJd8vVsC9I+9zJjVrwkLfIwI
2AkHxKXPOH6CbhGCbjMthYXipjDh5whmynRf1LCSFBeXjCdiVE3bocVda2l40X4xiYBHdK1NdEUB
XEZyHf5SoUc6fEwjJIuyPvlemWu0hcn0xqcqII8u0s2YOvId3jRiQzLy0ZOQUCZsC1QGA5dz+hQP
GIGsZ+u4PtN8ssxkmYFCjLx4sm+2kPA8ExXm7TBVtp1vswA1NzFKvlHPD0m6RptMRwutZOxXbWWj
YzWKVcyRWJ9GNq0dlYJUBjsp1XTLYSu3WCbP298qZgqIajMqQgNhDvDJ7VaHpw0BYNmq1m6tI6Yd
jWrSFtG1RBQEyocHO4eIYkmq8Ln1pFisyqZEiMTQ3f0n5SG7a6LoWu6RB/hAw7v/PkZImEY0vGiJ
ky1zA41mhC4gnyhnJfrgIeEwYgrXGG/E6c040i8H3GhLEWwDNeI5BNpPAxi3JaPkFhogrrki/qwJ
U397pKuCi228nYEcp8srzNrcwaxZb/NtL4MRPC1thVhnpdk5nahmqsHVX6RpH2UGokCddANAxYq5
BVzvdI+OFIbx9DfiU1AV1dBYxto4eUQok0WdSXHK6WOhs5hz/4u5IpwoSGWgZ8iA


--===============1343016536==--