From: marko.makela
Date: April 20 2011 7:14am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3593 to 3594)
List-Archive: http://lists.mysql.com/commits/135759
Message-Id: <201104200715.p3K7F9KG005844@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0876291667=="

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

IDM1OTQgTWFya28gTcOka2Vsw6QJMjAxMS0wNC0yMCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmMKIDM1OTMgVmFzaWwgRGltb3YJMjAxMS0w
NC0xOQogICAgICBGaXggY29tcGlsYXRpb24gd2FybmluZ3Mgd2hlbiBVTklWX1NZTkNfREVCVUcg
aXMgZW5hYmxlZAogICAgICAKICAgICAgbXlzcWwtdHJ1bmstaW5ub2RiL3N0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS9idWYwYnVmLmljOiAKICAgICAgSW4gZnVuY3Rpb24gJ2J1Zl9wYWdlX2hhc2hf
Z2V0X2xvdyc6CiAgICAgIG15c3FsLXRydW5rLWlubm9kYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvYnVmMGJ1Zi5pYzo5OTQ6IHdhcm5pbmc6IElTTyBDOTAgZm9yYmlkcyBtaXhlZCBkZWNsYXJh
dGlvbnMgYW5kIGNvZGUKICAgICAgbXlzcWwtdHJ1bmstaW5ub2RiL3N0b3JhZ2UvaW5ub2Jhc2Uv
aWJ1Zi9pYnVmMGlidWYuYzogSW4gCiAgICAgIGZ1bmN0aW9uICdpYnVmX3BhZ2VfbG93JzoKICAg
ICAgbXlzcWwtdHJ1bmstaW5ub2RiL3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYzox
MjAzOiB3YXJuaW5nOiBJU08gQzkwIGZvcmJpZHMgbWl4ZWQgZGVjbGFyYXRpb25zIGFuZCBjb2Rl
CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwog
ICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMGJ1Zi5pYwo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2lidWYvaWJ1ZjBpYnVmLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDQx
OTEzMTY1MS11Nm8zMHkyNHJod3JkbnhzCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVm
MGlidWYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyMDA3MTMwNC1pN2I2
YTFxMDVtdzQzbjN6CkBAIC0xMTc2LDEwICsxMTc2LDYgQEAgaWJ1Zl9wYWdlX2xvdygKIAogI2lm
ZGVmIFVOSVZfREVCVUcKIAlpZiAoIXhfbGF0Y2gpIHsKLSMgaWZkZWYgVU5JVl9TWU5DX0RFQlVH
Ci0JCXZvaWQqCWxhdGNoOwotIyBlbmRpZiAvKiBVTklWX1NZTkNfREVCVUcgKi8KLQogCQltdHJf
c3RhcnQoJmxvY2FsX210cik7CiAKIAkJLyogR2V0IHRoZSBiaXRtYXAgcGFnZSB3aXRob3V0IGEg
cGFnZSBsYXRjaCwgc28gdGhhdApAQCAtMTE5OSwxOCArMTE5NSw3IEBAIGlidWZfcGFnZV9sb3co
CiAJCQkJaWJ1Zl9iaXRtYXBfcGFnZV9ub19jYWxjKHppcF9zaXplLCBwYWdlX25vKSwKIAkJCQlS
V19OT19MQVRDSCwgTlVMTCwgQlVGX0dFVF9OT19MQVRDSCwKIAkJCQlmaWxlLCBsaW5lLCAmbG9j
YWxfbXRyKSk7Ci0jIGlmZGVmIFVOSVZfU1lOQ19ERUJVRwotCQkvKiBUaGlzIGlzIGZvciB0cmFj
a2luZyBCdWcgIzU4MjEyLiBUaGlzIGNoZWNrIGFuZCBtZXNzYWdlIGNhbgotCQliZSByZW1vdmVk
IG9uY2UgaXQgaGFzIGJlZW4gZXN0YWJsaXNoZWQgdGhhdCBvdXIgYXNzdW1wdGlvbnMKLQkJYWJv
dXQgdGhpcyBjb25kaXRpb24gYXJlIGNvcnJlY3QuIFRoZSBidWcgd2FzIG9ubHkgYSBvbmUtdGlt
ZQotCQlvY2N1cnJlbmNlLCB1bmFibGUgdG8gcmVwZWF0IHNpbmNlIHRoZW4uICovCi0JCWxhdGNo
ID0gc3luY190aHJlYWRfbGV2ZWxzX2NvbnRhaW5zKFNZTkNfSUJVRl9CSVRNQVApOwotCQlpZiAo
bGF0Y2gpIHsKLQkJCWZwcmludGYoc3RkZXJyLCAiQnVnIzU4MjEyIFVOSVZfU1lOQ19ERUJVRyIK
LQkJCQkiIGxldmVscyAlcCAoJXUsJXUpXG4iLAotCQkJCWxhdGNoLCAodW5zaWduZWQpIHNwYWNl
LCAodW5zaWduZWQpIHBhZ2Vfbm8pOwotCQl9Ci0jIGVuZGlmIC8qIFVOSVZfU1lOQ19ERUJVRyAq
LworCiAJCXJldCA9IGlidWZfYml0bWFwX3BhZ2VfZ2V0X2JpdHNfbG93KAogCQkJYml0bWFwX3Bh
Z2UsIHBhZ2Vfbm8sIHppcF9zaXplLAogCQkJTVRSX01FTU9fQlVGX0ZJWCwgJmxvY2FsX210ciwg
SUJVRl9CSVRNQVBfSUJVRik7Cgo=

--===============0876291667==
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/5.6-innodb/
# testament_sha1: ea18a9215c964607433f28464637006fcf89f9a1
# timestamp: 2011-04-20 10:15:05 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: vasil.dimov@stripped\
#   u6o30y24rhwrdnxs
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcsWHm8AAylflAAQUmP/91MC
EAC////wBAAIAFAFnuugSEQKAKCowAAAAA0GgDQDQCSgqn+U8mI0JTNpE/UJoAGQYmGqfqNTSGmR
oMhoYjQyDQMjBgAAAABoNAGgGgEkgIJkxNMgKn4IJg0obRpFVV+RBj3+zqe5gZ6qw15NhbYibFrJ
UwojOJRKTx62ZRjDAQQQPHVofECMaU+cBUV7A+iwhRVozinoTv/D2tlFrz8/TOPlgJd9l+IfJecO
Pjv/AEIOAxFMO3ZouaiArC/fYKgiImJbmZnRmPicye4aTJq4W8QpBwu4CRlq1mFtLnOrsUQVo2wE
acRwC2CjLOL3EbnCekhzCIC+hRV8SaAaRzKhwwmRtYqNf0UjqR8Sn8CiKYbFcjSwMzNeHE9qgFcI
8DicAtxIF4CrFAiPFhjmyog6VXGRYPFkGm4nS/sJ/cbYaR9xqyDuJx7seOoHIrGFrGxoyu3rZQLG
eO3LbqLNIBWAnA41FKp2XUqp7glbqgrClrBLY/Aw+4js6TPHoZOgh4Ns1cqAXO8GhvNjDkhb9LZU
m59h9WUE/aROdKccRe1syJZI0UEaWNlR9KItq7CrvENSLB70bhjKKcwIiZ0kCKt1RPsTh0oXyMMr
FiimVaGCAcRSyK6grZpbCeRXxC8lXfhpGEWWl/QLpOD1DcY6tFYnFdghiKTQE/TuoxaWiaYMMhWk
kXClbjQJxaazyMtvIHLA4CNWJOFCvUsh8dROsVlckLDuFxsIpcniKZbkJ9RjRGSoRwJlSNh8jTWE
WmSbLG4oYBKDaCyOPDYz4ZBJzHv+YiQ0kBW/QMPNZvGkSEWDwiOExMaIUJToGKxQD4DWepaYBWOO
T2bseB6lotofYMIKNDMMJj8uiI4K0a0gWDJdfaAScBmK4kXisfWxlxOAkP3wOpAR7eQhVFe/kxgR
S2CR01msgYViP0TEjcDZMHXHWJujGOsrC/HnMXUfuHw6Ce6o6/0ZiDd5HRAwXilQrKhch/EUjUKw
Ui9nlMb4HwdqwgdZfikMGCFkIWhoUt3vfnruVqZT1HMexaPNKLKROKJyExWTx9C8Y8hZQl4NLYLm
GQdAsK+fY+WBKrf00GWBMjHuzl5Digl5MMzqihLM8a9jYu30DddZ24XlzLcb+cTGVZdW4sn/o8O4
C/fEN4mE2WuzaenhzOZgFQEhOPMVImFbm4Tr/Pz4Lepi6mZA4OKOB0C8P0eZ5HNlaHwIwy0oJWHN
NtA2U/j0EUhYjYSURQD9izEwbR9hE+xMTN4WBkJ4PDHslbMKvvMwIlYFHYDkZQPXgv5tSMUmPbeJ
H2ZpYAL4OYcQLALBwktIiBWITBVgcjVQe1JpDuAmY+BIzD/TmM5DDRjdjREVYYPMQueAjAcFIkA8
BfRXIRBwmB5Igk545uRqSeENwVCHjCYXQO3Uj2cJGYPDVuBKgD4N0F+xCpSgqkfDxXtmhkxdkMMJ
wQI4RieAtXI9HZsFKAPc+ggIoOpUE+4UJ3jbQAoIuhAiQgkwsvMH6SJo4sMxSVBQA4muLJv0UBMC
ZjwHDGgNAxSXBvGkY8yYP4JSS3THivBwrjg+oi/QkHMilOiJg1QrcAPkRwFb4B6TCQqxdwmjBFoj
Goe0yC/4VPE9RdyRThQkMsWHm8A=


--===============0876291667==--