From: marko.makela
Date: April 20 2011 7:14am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3594)
List-Archive: http://lists.mysql.com/commits/135760
Message-Id: <201104200714.p3K7EX9b029454@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0266276280=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwNDE5MTMxNjUxLXU2bzMw
eTI0cmh3cmRueHMKCiAzNTk0IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDQtMjAgW21lcmdlXQogICAg
ICBNZXJnZSBteXNxbC01LjUtaW5ub2RiIHRvIG15c3FsLXRydW5rLWlubm9kYi4KCiAgICBtb2Rp
ZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmMnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIw
MTEwNDE5MTMxNjUxLXU2bzMweTI0cmh3cmRueHMKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pYnVm
L2lidWYwaWJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDIwMDcxMzA0
LWk3YjZhMXEwNW13NDNuM3oKQEAgLTExNzYsMTAgKzExNzYsNiBAQCBpYnVmX3BhZ2VfbG93KAog
CiAjaWZkZWYgVU5JVl9ERUJVRwogCWlmICgheF9sYXRjaCkgewotIyBpZmRlZiBVTklWX1NZTkNf
REVCVUcKLQkJdm9pZCoJbGF0Y2g7Ci0jIGVuZGlmIC8qIFVOSVZfU1lOQ19ERUJVRyAqLwotCiAJ
CW10cl9zdGFydCgmbG9jYWxfbXRyKTsKIAogCQkvKiBHZXQgdGhlIGJpdG1hcCBwYWdlIHdpdGhv
dXQgYSBwYWdlIGxhdGNoLCBzbyB0aGF0CkBAIC0xMTk5LDE4ICsxMTk1LDcgQEAgaWJ1Zl9wYWdl
X2xvdygKIAkJCQlpYnVmX2JpdG1hcF9wYWdlX25vX2NhbGMoemlwX3NpemUsIHBhZ2Vfbm8pLAog
CQkJCVJXX05PX0xBVENILCBOVUxMLCBCVUZfR0VUX05PX0xBVENILAogCQkJCWZpbGUsIGxpbmUs
ICZsb2NhbF9tdHIpKTsKLSMgaWZkZWYgVU5JVl9TWU5DX0RFQlVHCi0JCS8qIFRoaXMgaXMgZm9y
IHRyYWNraW5nIEJ1ZyAjNTgyMTIuIFRoaXMgY2hlY2sgYW5kIG1lc3NhZ2UgY2FuCi0JCWJlIHJl
bW92ZWQgb25jZSBpdCBoYXMgYmVlbiBlc3RhYmxpc2hlZCB0aGF0IG91ciBhc3N1bXB0aW9ucwot
CQlhYm91dCB0aGlzIGNvbmRpdGlvbiBhcmUgY29ycmVjdC4gVGhlIGJ1ZyB3YXMgb25seSBhIG9u
ZS10aW1lCi0JCW9jY3VycmVuY2UsIHVuYWJsZSB0byByZXBlYXQgc2luY2UgdGhlbi4gKi8KLQkJ
bGF0Y2ggPSBzeW5jX3RocmVhZF9sZXZlbHNfY29udGFpbnMoU1lOQ19JQlVGX0JJVE1BUCk7Ci0J
CWlmIChsYXRjaCkgewotCQkJZnByaW50ZihzdGRlcnIsICJCdWcjNTgyMTIgVU5JVl9TWU5DX0RF
QlVHIgotCQkJCSIgbGV2ZWxzICVwICgldSwldSlcbiIsCi0JCQkJbGF0Y2gsICh1bnNpZ25lZCkg
c3BhY2UsICh1bnNpZ25lZCkgcGFnZV9ubyk7Ci0JCX0KLSMgZW5kaWYgLyogVU5JVl9TWU5DX0RF
QlVHICovCisKIAkJcmV0ID0gaWJ1Zl9iaXRtYXBfcGFnZV9nZXRfYml0c19sb3coCiAJCQliaXRt
YXBfcGFnZSwgcGFnZV9ubywgemlwX3NpemUsCiAJCQlNVFJfTUVNT19CVUZfRklYLCAmbG9jYWxf
bXRyLCBJQlVGX0JJVE1BUF9JQlVGKTsKCg==

--===============0266276280==
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:14:29 +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=


--===============0266276280==--