From: marko.makela
Date: May 26 2011 6:30am
Subject: bzr push into mysql-trunk branch (marko.makela:3114 to 3115)
List-Archive: http://lists.mysql.com/commits/138143
Message-Id: <201105260630.p4Q6UMtv017644@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2085465108=="

--===============2085465108==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

IDMxMTUgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0yNgogICAgICBJbm5vREI6IEZpeCBhIGNvbXBp
bGVyIHdhcm5pbmcuCiAgICAgIAogICAgICBvcGVuX29yX2NyZWF0ZV9kYXRhX2ZpbGVzKCk6IFRy
dW5jYXRlIHRoZSBudW1iZXIgb2YgcGFnZXMgdG8gdWxpbnQuCiAgICAgIFRoZSBJbm5vREIgcGFn
ZSBudW1iZXIgaXMgMzIgYml0cy4gVGhpcyBsaW1pdHMgdGhlIHRhYmxlc3BhY2UgZmlsZSBzaXpl
CiAgICAgIHRvIDE8PCgzMitVTklWX1BBR0VfU0laRV9TSElGVCkgYnl0ZXMsIG9yIDY0IHRlcmFi
eXRlcy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0
LmMKIDMxMTQgRG1pdHJ5IFNodWxnYQkyMDExLTA1LTI1IFttZXJnZV0KICAgICAgTWVyZ2UgbXlz
cWwtNS41LT5teXNxbC10cnVuayBmb3IgZm9sbG93LXVwIGZvciBidWcjMTE3NDkzNDUuCgogICAg
bW9kaWZpZWQ6CiAgICAgIHNxbC9zcWxfc2hvdy5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3Ny
djBzdGFydC5jCXJldmlkOmRtaXRyeS5zaHVsZ2FAb3JhY2xlLmNvbS0yMDExMDUyNTE2NDgyOC1o
NzF6aGpuN25qMDdqbjdnCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI2MDYyOTQ4LWhkMDR5YnV6NHFyNmlq
YnkKQEAgLTg0MCw3ICs4NDAsOCBAQCBvcGVuX29yX2NyZWF0ZV9kYXRhX2ZpbGVzKAogCQkJdXRf
YShzaXplICE9IChvc19vZmZzZXRfdCkgLTEpOwogCQkJLyogUm91bmQgc2l6ZSBkb3dud2FyZCB0
byBtZWdhYnl0ZXMgKi8KIAotCQkJcm91bmRlZF9zaXplX3BhZ2VzID0gc2l6ZSA+PiBVTklWX1BB
R0VfU0laRV9TSElGVDsKKwkJCXJvdW5kZWRfc2l6ZV9wYWdlcyA9ICh1bGludCkKKwkJCQkoc2l6
ZSA+PiBVTklWX1BBR0VfU0laRV9TSElGVCk7CiAKIAkJCWlmIChpID09IHNydl9uX2RhdGFfZmls
ZXMgLSAxCiAJCQkgICAgJiYgc3J2X2F1dG9fZXh0ZW5kX2xhc3RfZGF0YV9maWxlKSB7Cgo=

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@stripped
# target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# testament_sha1: 9ce5c63e320dbd09f78dfcf073cafd9d557c06b6
# timestamp: 2011-05-26 09:30:19 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# base_revision_id: dmitry.shulga@stripped\
#   h71zhjn7nj07jn7g
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbxEmaIAAZRflEAwUm///3fj
TxC////wBAAIAFAD5e7lxbl1bpAYSiEE2gU9pR4kyIPFAPU00/SmajynlP1TQAympT2JpM0E09Q1
GmRpp6jQaA0aAAASSAmgUemhGk2k8ETymJoAABoNBzAmJoMJkyZMjCYJppkYmAIYBJKNFPRknqbT
U02mTRGjIANAAB6nqNCgwUkqOvBeHy/ZC2Cmea51AFwtGETTPjN29NVKqpx3mTpH9tseWUhZLI3+
x1alm6W4fy6/fKc9HCyi+MbrX38YkiL0CMFTOPbH3Cfz3QEUBSYw7luuVm0bNKrW4D8Ah5qLTSyD
RH84LPp0kUT6oSHUARBNG9BS4Wka5MIxpxlEwiC7EuEth3qUawcpk6LCHpXQrLkbHb90xHZoMjHi
HwbqicHZX1P7GXJPXSeT9qbkXae2SVFzMSGFqRWZ7DAQt63QYNqS1RGxPS9Z0cJXUGG5cUHwCN7V
koms4W+Fa01UjWuBgRg6Kcz7mMGTX1PfzwgKarJGUzJ84MAWCYoCLY1FDeNEAt184Z4RgyUyDLED
MpIVFcRmL2GMswCwGeqO4xFlBe6IvEK5g3OUKi2V5QsBsXAvDIzlsBlknW+K+BHKhS/LOstUCgsm
COElIhqn56UvxZW3Zwg0byx5Kb0zmiVBOpuNV+ar1GU68xkje1ujz98u2tNKIczfmKVFGfX4jvI4
nInehxMjmZDCLSNYWisL7ixpAtJg6JsNb2RgZvTpcZY2Hwzhurf0kBz+qZK5qaXxGSNRK/K4HjgA
75ooMEKLdgDXCjCrdO3GDkWHm7tmMx3ovdG802N5CchHO4awUrT6HRS3WdgREL7chQqEL0Q/WsZk
WpRImJFVGmXQDVmroEcuGhNkqMckVJAn0Jb9kgUXPzXJpOj0HUleOsuz7PU1i6mAkVaguitoizV4
VORTpAFy8NbrZ7suNyvRePPQ1VPcgYQMTz4TKsn2p9szxTELil7EXQcnqbqyHCUMYlO6AyvkM9x8
urpbdzuNpY/Fbr2ZgZi3am5QcL8Zyt3Moq9YSMReubSZ0poFOFLOJsFYXo3HvhwQXwi0ZgrDM3XC
EciqFUripcmaoC2gMaDXUEgSPApC6kMEvKsjFuLqqtqRwAz/Y7hnaMFQsheak2iyMRzSi87hMXcc
ZyB0XGyzmUQ9hzEq2YGZVjlr162YCRXLQhTDdDQ0dPekVhYtzlknn6KFG5GZQJDVYwn6BSxORl1N
rFBzJLXmkimN5PiigqTYP4vCClLfMOMTxybkiz3JmaDrTnazYphdvgUWqndvR0vOtWow1LSnO7x1
+QHPa6FoxvYhlpWcsawsCCzZUTgnduPWs9eyZhS9gu0icKKzBVdR6kSYYGbUJ2xjt2izUOlR1Fzf
4Ytf+LuSKcKEheIkzRA=


--===============2085465108==--