From: marko.makela
Date: May 26 2011 6:29am
Subject: bzr commit into mysql-trunk branch (marko.makela:3115)
List-Archive: http://lists.mysql.com/commits/138142
Message-Id: <201105260630.p4Q6U1jI003715@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1003649599=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC10cnVuay8g
YmFzZWQgb24gcmV2aWQ6ZG1pdHJ5LnNodWxnYUBvcmFjbGUuY29tLTIwMTEwNTI1MTY0ODI4LWg3
MXpoam43bmowN2puN2cKCiAzMTE1IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDUtMjYKICAgICAgSW5u
b0RCOiBGaXggYSBjb21waWxlciB3YXJuaW5nLgogICAgICAKICAgICAgb3Blbl9vcl9jcmVhdGVf
ZGF0YV9maWxlcygpOiBUcnVuY2F0ZSB0aGUgbnVtYmVyIG9mIHBhZ2VzIHRvIHVsaW50LgogICAg
ICBUaGUgSW5ub0RCIHBhZ2UgbnVtYmVyIGlzIDMyIGJpdHMuIFRoaXMgbGltaXRzIHRoZSB0YWJs
ZXNwYWNlIGZpbGUgc2l6ZQogICAgICB0byAxPDwoMzIrVU5JVl9QQUdFX1NJWkVfU0hJRlQpIGJ5
dGVzLCBvciA2NCB0ZXJhYnl0ZXMuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2Uvc3J2L3NydjBzdGFydC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Ny
di9zcnYwc3RhcnQuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmMJcmV2
aWQ6ZG1pdHJ5LnNodWxnYUBvcmFjbGUuY29tLTIwMTEwNTI1MTY0ODI4LWg3MXpoam43bmowN2pu
N2cKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmMJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTA1MjYwNjI5NDgtaGQwNHlidXo0cXI2aWpieQpAQCAtODQwLDcg
Kzg0MCw4IEBAIG9wZW5fb3JfY3JlYXRlX2RhdGFfZmlsZXMoCiAJCQl1dF9hKHNpemUgIT0gKG9z
X29mZnNldF90KSAtMSk7CiAJCQkvKiBSb3VuZCBzaXplIGRvd253YXJkIHRvIG1lZ2FieXRlcyAq
LwogCi0JCQlyb3VuZGVkX3NpemVfcGFnZXMgPSBzaXplID4+IFVOSVZfUEFHRV9TSVpFX1NISUZU
OworCQkJcm91bmRlZF9zaXplX3BhZ2VzID0gKHVsaW50KQorCQkJCShzaXplID4+IFVOSVZfUEFH
RV9TSVpFX1NISUZUKTsKIAogCQkJaWYgKGkgPT0gc3J2X25fZGF0YV9maWxlcyAtIDEKIAkJCSAg
ICAmJiBzcnZfYXV0b19leHRlbmRfbGFzdF9kYXRhX2ZpbGUpIHsKCg==

--===============1003649599==
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:29:55 +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=


--===============1003649599==--