From: marko.makela
Date: February 15 2011 8:51am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3708) Bug#59307
List-Archive: http://lists.mysql.com/commits/131254
X-Bug: 59307
Message-Id: <201102150852.p1F8ULw4023165@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0473756872=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAyMTQxMDA3NTktMGZkanM0
b2N4YzA2cmFndQoKIDM3MDggTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xNQogICAgICBCdWcjNTkz
MDcgVmFsZ3JpbmQ6IHVuaW5pdGlhbGl6ZWQgdmFsdWUgaW4gcndfbG9ja19zZXRfd3JpdGVyX2lk
X2FuZF9yZWN1cnNpb25fZmxhZygpCiAgICAgIAogICAgICByd19sb2NrX2NyZWF0ZV9mdW5jKCk6
IEluaXRpYWxpemUgbG9jay0+d3JpdGVyX3RocmVhZCwgc28gdGhhdCBWYWxncmluZAogICAgICB3
aWxsIG5vdCBjb21wbGFpbiBldmVuIHdoZW4gVmFsZ3JpbmQgaW5zdHJ1bWVudGF0aW9uIGlzIG5v
dCBlbmFibGVkLgogICAgICBGbGFnIGxvY2stPndyaXRlcl90aHJlYWQgdW5pbml0aWFsaXplZCwg
c28gdGhhdCBWYWxncmluZCBjYW4gY29tcGxhaW4KICAgICAgd2hlbiBpdCBpcyB1c2VkIHVuaW5p
dGlhbGl6ZWQuCiAgICAgIAogICAgICByd19sb2NrX3NldF93cml0ZXJfaWRfYW5kX3JlY3Vyc2lv
bl9mbGFnKCk6IFJldmVydCB0aGUgYm9ndXMgVmFsZ3JpbmQKICAgICAgaW5zdHJ1bWVudGF0aW9u
IHRoYXQgd2FzIHB1c2hlZCBpbiB0aGUgZmlyc3QgYXR0ZW1wdCB0byBmaXggdGhpcyBidWcuCgog
ICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9i
dWc1OTMwNy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5u
b2RiX2J1ZzU5MzA3LnRlc3QKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVn
aW4vQ2hhbmdlTG9nCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3N5bmMwcncu
aWMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3N5bmMvc3luYzBydy5jCj09PSBhZGRlZCBm
aWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGJfYnVnNTkzMDcucmVz
dWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGJfYnVnNTkz
MDcucmVzdWx0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzU5MzA3LnJlc3VsdAlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDExMDIxNTA4NTEzMy10dzFzcXl2eHpoYXcwNGV1CkBAIC0wLDAgKzEs
MjggQEAKK0NSRUFURSBUQUJMRSB0MSAoCit0MV9pbnQgSU5ULAordDFfdGltZSBUSU1FCispIEVO
R0lORT1pbm5vZGI7CitDUkVBVEUgVEFCTEUgdDIgKAordDJfaW50IGludCBQUklNQVJZIEtFWSwK
K3QyX2ludDIgSU5UCispIEVOR0lORT1JTk5PREI7CitJTlNFUlQgSU5UTyB0MiBWQUxVRVMgKCk7
CitXYXJuaW5nczoKK1dhcm5pbmcJMTM2NAlGaWVsZCAndDJfaW50JyBkb2Vzbid0IGhhdmUgYSBk
ZWZhdWx0IHZhbHVlCitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKCk7CitTRUxFQ1QgKgorRlJPTSB0
MSBBUyB0MWEKK1dIRVJFIE5PVCBFWElTVFMKKyhTRUxFQ1QgKgorRlJPTSB0MSBBUyB0MWIKK1dI
RVJFIHQxYi50MV9pbnQgTk9UIElOCisoU0VMRUNUIHQyLnQyX2ludAorRlJPTSB0MgorV0hFUkUg
dDFiLnQxX3RpbWUgTElLRSB0MWIudDFfaW50CitPUiB0MWIudDFfdGltZSA8PiB0Mi50Ml9pbnQy
CitBTkQgNj03CispCispCis7Cit0MV9pbnQJdDFfdGltZQorRFJPUCBUQUJMRSB0MSx0MjsKCj09
PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVn
NTkzMDcudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2Ri
X2J1ZzU5MzA3LnRlc3QJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysgYi9teXNxbC10ZXN0
L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNTkzMDcudGVzdAlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNTA4NTEzMy10dzFzcXl2eHpoYXcwNGV1CkBAIC0wLDAg
KzEsMzIgQEAKKy0tIHNvdXJjZSBpbmNsdWRlL2hhdmVfaW5ub2RiX3BsdWdpbi5pbmMKKyMgQnVn
ICM1OTMwNyB1bmluaXRpYWxpemVkIHZhbHVlIGluIHJ3X2xvY2tfc2V0X3dyaXRlcl9pZF9hbmRf
cmVjdXJzaW9uX2ZsYWcoKQorIyB3aGVuIFZhbGdyaW5kIGluc3RydW1lbnRhdGlvbiAoVU5JVl9E
RUJVR19WQUxHUklORCkgaXMgbm90IGVuYWJsZWQKKworQ1JFQVRFIFRBQkxFIHQxICgKKyAgdDFf
aW50IElOVCwKKyAgdDFfdGltZSBUSU1FCispIEVOR0lORT1pbm5vZGI7CisKK0NSRUFURSBUQUJM
RSB0MiAoCisgIHQyX2ludCBpbnQgUFJJTUFSWSBLRVksCisgIHQyX2ludDIgSU5UCispIEVOR0lO
RT1JTk5PREI7CisKK0lOU0VSVCBJTlRPIHQyIFZBTFVFUyAoKTsKK0lOU0VSVCBJTlRPIHQxIFZB
TFVFUyAoKTsKKworU0VMRUNUICoKK0ZST00gdDEgQVMgdDFhCitXSEVSRSBOT1QgRVhJU1RTCisg
IChTRUxFQ1QgKgorICAgRlJPTSB0MSBBUyB0MWIKKyAgIFdIRVJFIHQxYi50MV9pbnQgTk9UIElO
CisgICAgIChTRUxFQ1QgdDIudDJfaW50CisgICAgICBGUk9NIHQyCisgICAgICBXSEVSRSB0MWIu
dDFfdGltZSBMSUtFIHQxYi50MV9pbnQKKyAgICAgIE9SIHQxYi50MV90aW1lIDw+IHQyLnQyX2lu
dDIKKyAgICAgIEFORCA2PTcKKyApCispCis7CitEUk9QIFRBQkxFIHQxLHQyOwoKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTEw
MjE0MTAwNzU5LTBmZGpzNG9jeGMwNnJhZ3UKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0No
YW5nZUxvZwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNTA4NTEzMy10dzFz
cXl2eHpoYXcwNGV1CkBAIC0xLDMgKzEsOSBAQAorMjAxMS0wMi0xNQlUaGUgSW5ub0RCIFRlYW0K
KworCSogc3luYy9zeW5jMHJ3LmMsIGlubm9kYl9idWc1OTMwNy50ZXN0OgorCUJ1ZyM1OTMwNyBW
YWxncmluZDogdW5pbml0aWFsaXplZCB2YWx1ZSBpbgorCXJ3X2xvY2tfc2V0X3dyaXRlcl9pZF9h
bmRfcmVjdXJzaW9uX2ZsYWcoKQorCiAyMDExLTAyLTE0CVRoZSBJbm5vREIgVGVhbQogCiAJKiBo
YW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2M6Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL2luY2x1ZGUvc3luYzBydy5pYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L2luY2x1ZGUvc3luYzBydy5pYwlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMTAyMTQx
MDA3NTktMGZkanM0b2N4YzA2cmFndQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVk
ZS9zeW5jMHJ3LmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjE1MDg1MTMz
LXR3MXNxeXZ4emhhdzA0ZXUKQEAgLTI4MCw3ICsyODAsNiBAQCByd19sb2NrX3NldF93cml0ZXJf
aWRfYW5kX3JlY3Vyc2lvbl9mbGFnCiAJbG9jYWxfdGhyZWFkID0gbG9jay0+d3JpdGVyX3RocmVh
ZDsKIAlzdWNjZXNzID0gb3NfY29tcGFyZV9hbmRfc3dhcF90aHJlYWRfaWQoCiAJCSZsb2NrLT53
cml0ZXJfdGhyZWFkLCBsb2NhbF90aHJlYWQsIGN1cnJfdGhyZWFkKTsKLQlVTklWX01FTV9WQUxJ
RCgmc3VjY2Vzcywgc2l6ZW9mKHN1Y2Nlc3MpKTsKIAl1dF9hKHN1Y2Nlc3MpOwogCWxvY2stPnJl
Y3Vyc2l2ZSA9IHJlY3Vyc2l2ZTsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9zeW5jL3N5bmMwcncuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3N5bmMv
c3luYzBydy5jCXJldmlkOmppbW15LnlhbmdAb3JhY2xlLmNvbS0yMDExMDIxNDEwMDc1OS0wZmRq
czRvY3hjMDZyYWd1CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9zeW5jL3N5bmMwcncuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNTA4NTEzMy10dzFzcXl2eHpoYXcw
NGV1CkBAIC0yNjAsNiArMjYwLDkgQEAgcndfbG9ja19jcmVhdGVfZnVuYygKIAljb250YWlucyBn
YXJiYWdlIGF0IGluaXRpYWxpemF0aW9uIGFuZCBjYW5ub3QgYmUgdXNlZCBmb3IKIAlyZWN1cnNp
dmUgeC1sb2NraW5nLiAqLwogCWxvY2stPnJlY3Vyc2l2ZSA9IEZBTFNFOworCS8qIFNpbGVuY2Ug
VmFsZ3JpbmQgd2hlbiBVTklWX0RFQlVHX1ZBTEdSSU5EIGlzIG5vdCBlbmFibGVkLiAqLworCW1l
bXNldCgodm9pZCopICZsb2NrLT53cml0ZXJfdGhyZWFkLCAwLCBzaXplb2YgbG9jay0+d3JpdGVy
X3RocmVhZCk7CisJVU5JVl9NRU1fSU5WQUxJRCgmbG9jay0+d3JpdGVyX3RocmVhZCwgc2l6ZW9m
IGxvY2stPndyaXRlcl90aHJlYWQpOwogCiAjaWZkZWYgVU5JVl9TWU5DX0RFQlVHCiAJVVRfTElT
VF9JTklUKGxvY2stPmRlYnVnX2xpc3QpOwoK

--===============0473756872==
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.1-innodb/
# testament_sha1: 76189fa0109fc9fe3eefe4bc9546452e42996f3f
# timestamp: 2011-02-15 10:51:47 +0200
# base_revision_id: jimmy.yang@stripped\
#   0fdjs4ocxc06ragu
# 
# Begin bundle
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


--===============0473756872==--