From: Marc Alff
Date: April 7 2011 6:13pm
Subject: bzr commit into mysql-5.6-labs-performance-schema branch (marc.alff:3341)
List-Archive: http://lists.mysql.com/commits/134975
Message-Id: <201104071813.p37IDmLZ007863@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7090253098873950343=="

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

#At file:///Users/malff/BZR_TREE/mysql-5.6-labs-performance-schema/ based on revid:jorgen.loland@stripped

 3341 Marc Alff	2011-04-07
      created new tree

    modified:
      .bzr-mysql/default.conf
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2011-04-07 12:31:51 +0000
+++ b/.bzr-mysql/default.conf	2011-04-07 18:13:30 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-trunk"
+tree_name = "mysql-5.6-labs-performance-schema"


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-5.6-labs-\
#   performance-schema/
# testament_sha1: 29a3fbdd77e6ea46e6e29145170ead18d65be606
# timestamp: 2011-04-07 20:13:37 +0200
# base_revision_id: jorgen.loland@stripped\
#   uqf1btsg4ezb9gwu
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf/bX9kAAWTfgEAQUGP/93IC
AAC////wUAMngAUABohGgNQw0mmmjEGjINDQMBoDQAAaaDQDQBoMBoDQAAaaDQDQBoMBoDQAAaaD
QDQBoEkUxNA0TTI0Ep4TaJPEmm1NpLVR0DHRYGtkELH0ESwaJ5ktXSbLaDM8byyU7AaEHznePD70
iPJBDPCCeGNNLZQgwVYpzdBLQPL4yBBA10RlUPz/xsceqoep0SikWq4M9HsjBHXfwFU+V7AzCHh0
cRwTeMxFhNZTnFVqbyq37jiKioLtDrP72CJbGHhIRib1CLrdHGWd2YsO5fFiZvm+Vmu4uf+5igv0
L7OX6+KOq4SWwpDF2zzXF1ewi5QXFnrWKtyjENsctsKetgp2TIStiLt4GNZytfVt2BZWIZZcLKkY
KDWVTTYtmarA74aKRiLUuI67LcGNOVBk985TzN0s6NWbNbfkmLSdBbOsaBJhctdcL5KRkRGoVKTi
dkGEnrhU19xjbIpcthaZNa97l2BNospUcurqTTaRIK5t6Gx4552u/Ju737doLmlbO5kx+ff7Ujgy
PW6Be4dTgUYzY1P5p1GO3ZIpzwnjEPJLxzM6yN63fqCWCGMG5LywRp4HG3wzO/gpwkRkcF39y3gP
Ku59T6sHON5U7JGyRJk2hybCvzx323L1rT8IJ1viZ3Hw1bA9hpqrgBgEkNvslEyotsD0thwwgKu3
MXI4kMcSfOjU5Lny9Z72j/jmJkrz3TKir1z5FG5cSYZSXVQ2gqj6WsBjXXEXpFLRO5zgMlQ/Xh7U
3Dnl5ibEUNVTJFS9F3qIVuVq5cCyZf8ftNHoaJzL8Bb878asg1X9B1qqiuehULIMl0WgTCLhA9Fz
mkMfvmlom7xbu3smV9qRedD2PYbTjBXlWJwshAosK7YTruUX+7HDpcspg6jBlVrYh2TLr2u3riCi
EHUD9pHEPpTQ2lSv1pvZk5iQmLFT3V1p1zXvvrzTFqS7oAZ4jou6ZEyuafg6NWsqyjAPBVksfMWh
X30koOXbgaC8vlTJIz8+qd/4UaqzQlVn3WFysC1cLHlvTrLH6XXBdbtFsvcVq1R8JlQU1+FbBUPh
8v/F3JFOFCQ/9tf2QA==


--===============7090253098873950343==--