From: marko.makela
Date: February 15 2011 9:31am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3320)
List-Archive: http://lists.mysql.com/commits/131261
Message-Id: <201102150931.p1F8pBsM007232@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1532541070=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAyMTQxMDE3NTEtdnQ2N3Z5
c2U1ZHkyNnZpagoKIDMzMjAgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xNSBbbWVyZ2VdCiAgICAg
IE1lcmdlIG15c3FsLTUuMS1pbm5vZGIgdG8gbXlzcWwtNS41LWlubm9kYi4KCiAgICBhZGRlZDoK
ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNTkzMDcucmVzdWx0CiAg
ICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzU5MzA3LnRlc3QKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3luYzBydy5pYwogICAgICBz
dG9yYWdlL2lubm9iYXNlL3N5bmMvc3luYzBydy5jCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0
L3N1aXRlL2lubm9kYi9yL2lubm9kYl9idWc1OTMwNy5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzU5MzA3LnJlc3VsdAkxOTcwLTAxLTAxIDAwOjAwOjAw
ICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzU5MzA3LnJl
c3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNTA5Mjk1Ni1tMWZxM2Qw
M3FiZWJjbjFxCkBAIC0wLDAgKzEsMjggQEAKK0NSRUFURSBUQUJMRSB0MSAoCit0MV9pbnQgSU5U
LAordDFfdGltZSBUSU1FCispIEVOR0lORT1pbm5vZGI7CitDUkVBVEUgVEFCTEUgdDIgKAordDJf
aW50IGludCBQUklNQVJZIEtFWSwKK3QyX2ludDIgSU5UCispIEVOR0lORT1JTk5PREI7CitJTlNF
UlQgSU5UTyB0MiBWQUxVRVMgKCk7CitXYXJuaW5nczoKK1dhcm5pbmcJMTM2NAlGaWVsZCAndDJf
aW50JyBkb2Vzbid0IGhhdmUgYSBkZWZhdWx0IHZhbHVlCitJTlNFUlQgSU5UTyB0MSBWQUxVRVMg
KCk7CitTRUxFQ1QgKgorRlJPTSB0MSBBUyB0MWEKK1dIRVJFIE5PVCBFWElTVFMKKyhTRUxFQ1Qg
KgorRlJPTSB0MSBBUyB0MWIKK1dIRVJFIHQxYi50MV9pbnQgTk9UIElOCisoU0VMRUNUIHQyLnQy
X2ludAorRlJPTSB0MgorV0hFUkUgdDFiLnQxX3RpbWUgTElLRSB0MWIudDFfaW50CitPUiB0MWIu
dDFfdGltZSA8PiB0Mi50Ml9pbnQyCitBTkQgNj03CispCispCis7Cit0MV9pbnQJdDFfdGltZQor
RFJPUCBUQUJMRSB0MSx0MjsKCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9k
Yi90L2lubm9kYl9idWc1OTMwNy50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90
L2lubm9kYl9idWc1OTMwNy50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNTkzMDcudGVzdAlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNTA5Mjk1Ni1tMWZxM2QwM3FiZWJjbjFxCkBAIC0wLDAg
KzEsMzIgQEAKKy0tIHNvdXJjZSBpbmNsdWRlL2hhdmVfaW5ub2RiLmluYworIyBCdWcgIzU5MzA3
IHVuaW5pdGlhbGl6ZWQgdmFsdWUgaW4gcndfbG9ja19zZXRfd3JpdGVyX2lkX2FuZF9yZWN1cnNp
b25fZmxhZygpCisjIHdoZW4gVmFsZ3JpbmQgaW5zdHJ1bWVudGF0aW9uIChVTklWX0RFQlVHX1ZB
TEdSSU5EKSBpcyBub3QgZW5hYmxlZAorCitDUkVBVEUgVEFCTEUgdDEgKAorICB0MV9pbnQgSU5U
LAorICB0MV90aW1lIFRJTUUKKykgRU5HSU5FPWlubm9kYjsKKworQ1JFQVRFIFRBQkxFIHQyICgK
KyAgdDJfaW50IGludCBQUklNQVJZIEtFWSwKKyAgdDJfaW50MiBJTlQKKykgRU5HSU5FPUlOTk9E
QjsKKworSU5TRVJUIElOVE8gdDIgVkFMVUVTICgpOworSU5TRVJUIElOVE8gdDEgVkFMVUVTICgp
OworCitTRUxFQ1QgKgorRlJPTSB0MSBBUyB0MWEKK1dIRVJFIE5PVCBFWElTVFMKKyAgKFNFTEVD
VCAqCisgICBGUk9NIHQxIEFTIHQxYgorICAgV0hFUkUgdDFiLnQxX2ludCBOT1QgSU4KKyAgICAg
KFNFTEVDVCB0Mi50Ml9pbnQKKyAgICAgIEZST00gdDIKKyAgICAgIFdIRVJFIHQxYi50MV90aW1l
IExJS0UgdDFiLnQxX2ludAorICAgICAgT1IgdDFiLnQxX3RpbWUgPD4gdDIudDJfaW50MgorICAg
ICAgQU5EIDY9NworICkKKykKKzsKK0RST1AgVEFCTEUgdDEsdDI7Cgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3N5bmMwcncuaWMnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9zeW5jMHJ3LmljCXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDEx
MDIxNDEwMTc1MS12dDY3dnlzZTVkeTI2dmlqCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9zeW5jMHJ3LmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjE1MDkyOTU2
LW0xZnEzZDAzcWJlYmNuMXEKQEAgLTI4MCw3ICsyODAsNiBAQCByd19sb2NrX3NldF93cml0ZXJf
aWRfYW5kX3JlY3Vyc2lvbl9mbGFnCiAJbG9jYWxfdGhyZWFkID0gbG9jay0+d3JpdGVyX3RocmVh
ZDsKIAlzdWNjZXNzID0gb3NfY29tcGFyZV9hbmRfc3dhcF90aHJlYWRfaWQoCiAJCSZsb2NrLT53
cml0ZXJfdGhyZWFkLCBsb2NhbF90aHJlYWQsIGN1cnJfdGhyZWFkKTsKLQlVTklWX01FTV9WQUxJ
RCgmc3VjY2Vzcywgc2l6ZW9mKHN1Y2Nlc3MpKTsKIAl1dF9hKHN1Y2Nlc3MpOwogCWxvY2stPnJl
Y3Vyc2l2ZSA9IHJlY3Vyc2l2ZTsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2Uvc3luYy9zeW5jMHJ3LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMHJ3LmMJ
cmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTEwMjE0MTAxNzUxLXZ0Njd2eXNlNWR5MjZ2
aWoKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwcncuYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDExMDIxNTA5Mjk1Ni1tMWZxM2QwM3FiZWJjbjFxCkBAIC0yNzEsNiAr
MjcxLDkgQEAgcndfbG9ja19jcmVhdGVfZnVuYygKIAljb250YWlucyBnYXJiYWdlIGF0IGluaXRp
YWxpemF0aW9uIGFuZCBjYW5ub3QgYmUgdXNlZCBmb3IKIAlyZWN1cnNpdmUgeC1sb2NraW5nLiAq
LwogCWxvY2stPnJlY3Vyc2l2ZSA9IEZBTFNFOworCS8qIFNpbGVuY2UgVmFsZ3JpbmQgd2hlbiBV
TklWX0RFQlVHX1ZBTEdSSU5EIGlzIG5vdCBlbmFibGVkLiAqLworCW1lbXNldCgodm9pZCopICZs
b2NrLT53cml0ZXJfdGhyZWFkLCAwLCBzaXplb2YgbG9jay0+d3JpdGVyX3RocmVhZCk7CisJVU5J
Vl9NRU1fSU5WQUxJRCgmbG9jay0+d3JpdGVyX3RocmVhZCwgc2l6ZW9mIGxvY2stPndyaXRlcl90
aHJlYWQpOwogCiAjaWZkZWYgVU5JVl9TWU5DX0RFQlVHCiAJVVRfTElTVF9JTklUKGxvY2stPmRl
YnVnX2xpc3QpOwoK

--===============1532541070==
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.5-innodb/
# testament_sha1: e9ae32b61ffd2ee526d5d6e80d65a6f8b8e0b10e
# timestamp: 2011-02-15 11:31:25 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: jimmy.yang@stripped\
#   vt67vyse5dy26vij
# 
# Begin bundle
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
KcKEg4UevXA=


--===============1532541070==--