From: marko.makela
Date: April 21 2010 10:01am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3409 to 3411)
List-Archive: http://lists.mysql.com/commits/106225
Message-Id: <201004211002.o3L9YHS0023666@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1447263401=="

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

IDM0MTEgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yMQogICAgICBoYV9pbm5vYmFzZTo6YWRkX2lu
ZGV4KCk6IE9ubHkgY2hlY2sgZm9yIGR1cGxpY2F0ZSBpbmRleGVzCiAgICAgIHdoZW4gdGhlIGRh
dGEgZGljdGlvbmFyeSBpcyBsb2NrZWQuCiAgICAgIFRoaXMgZml4ZXMgYSBVTklWX0RFQlVHIGFz
c2VydGlvbiBmYWlsdXJlIGluIGlubm9kYi1pbmRleC50ZXN0LgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCiAzNDEwIE1h
cmtvIE3DpGtlbMOkCTIwMTAtMDQtMjEKICAgICAgZHR1cGxlX2NvbnZlcnRfYmlnX3JlYygpOiBT
dG9yZSBsb2NhbGx5IGFueSBmaWVsZHMgd2hvc2UgbWF4aW11bSBsZW5ndGgKICAgICAgaXMgbGVz
cyB0aGFuIDI1NiBieXRlcy4gKEJ1ZyAjNTI3NDUpCiAgICAgIEFkZCByZWxhdGVkIGNvbW1lbnRz
IGFuZCBkZWJ1ZyBhc3NlcnRpb25zIHRvIHRoZSAib2Zmc2V0cyIKICAgICAgZnVuY3Rpb25zIGlu
IHJlbTByZWMuYy4KICAgICAgQXBwcm92ZWQgYnkgU3VubnkgQmFpbnMKCiAgICBtb2RpZmllZDoK
ICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwogICAgICBzdG9yYWdlL2lubm9k
Yl9wbHVnaW4vZGF0YS9kYXRhMGRhdGEuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcmVt
L3JlbTByZWMuYwogMzQwOSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA0LTIxCiAgICAgIEFkanVzdCB0
ZXN0cyBmb3IgdGhlIEJ1ZyAjNTA0OTUgZml4LgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10
ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGItemlwLnJlc3VsdAogICAgICBteXNxbC10
ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGItemlwLnRlc3QKICAgICAgbXlzcWwtdGVz
dC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzM2MTY5LnRlc3QKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9DaGFuZ2VMb2cJMjAxMC0wNC0yMCAxMTo0MjoyMiArMDAwMAorKysgYi9zdG9y
YWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCTIwMTAtMDQtMjEgMDk6NTA6MzMgKzAwMDAKQEAg
LTEsMyArMSw4IEBACisyMDEwLTA0LTIxCVRoZSBJbm5vREIgVGVhbQorCisJKiBkYXRhL2RhdGEw
ZGF0YS5jOgorCUZpeCBCdWcjNTI3NDUgRmFpbGluZyBhc3NlcnRpb246IGJsb2Jfbm8gPCBwYWdl
X3ppcC0+bl9ibG9icworCiAyMDEwLTA0LTIwCVRoZSBJbm5vREIgVGVhbQogCiAJKiBkaWN0L2Rp
Y3QwY3JlYS5jLCBoYW5kbGVyL2hhX2lubm9kYi5jYywgaW5jbHVkZS90cngwdHJ4Lmg6Cgo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2RhdGEvZGF0YTBkYXRhLmMnCi0t
LSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kYXRhL2RhdGEwZGF0YS5jCTIwMDktMDUtMjUgMTI6
MDk6MjQgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2RhdGEvZGF0YTBkYXRhLmMJ
MjAxMC0wNC0yMSAwOTo1MDozMyArMDAwMApAQCAtNjY2LDYgKzY2NiwyMSBAQCBkdHVwbGVfY29u
dmVydF9iaWdfcmVjKAogCQkJCWdvdG8gc2tpcF9maWVsZDsKIAkJCX0KIAorCQkJLyogSW4gRFlO
QU1JQyBhbmQgQ09NUFJFU1NFRCBmb3JtYXQsIHN0b3JlCisJCQlsb2NhbGx5IGFueSBub24tQkxP
QiBjb2x1bW5zIHdob3NlIG1heGltdW0KKwkJCWxlbmd0aCBkb2VzIG5vdCBleGNlZWQgMjU2IGJ5
dGVzLiAgVGhpcyBpcworCQkJYmVjYXVzZSB0aGVyZSBpcyBubyByb29tIGZvciB0aGUgImV4dGVy
bmFsCisJCQlzdG9yYWdlIiBmbGFnIHdoZW4gdGhlIG1heGltdW0gbGVuZ3RoIGlzIDI1NQorCQkJ
Ynl0ZXMgb3IgbGVzcy4gVGhpcyByZXN0cmljdGlvbiB0cml2aWFsbHkKKwkJCWhvbGRzIGluIFJF
RFVOREFOVCBhbmQgQ09NUEFDVCBmb3JtYXQsIGJlY2F1c2UKKwkJCXRoZXJlIHdlIGFsd2F5cyBz
dG9yZSBsb2NhbGx5IGNvbHVtbnMgd2hvc2UKKwkJCWxlbmd0aCBpcyB1cCB0byBsb2NhbF9sZW4g
PT0gNzg4IGJ5dGVzLgorCQkJQHNlZSByZWNfaW5pdF9vZmZzZXRzX2NvbXBfb3JkaW5hcnkgKi8K
KwkJCWlmIChpZmllbGQtPmNvbC0+bXR5cGUgIT0gREFUQV9CTE9CCisJCQkgICAgJiYgaWZpZWxk
LT5jb2wtPmxlbiA8IDI1NikgeworCQkJCWdvdG8gc2tpcF9maWVsZDsKKwkJCX0KKwogCQkJbG9u
Z2VzdF9pID0gaTsKIAkJCWxvbmdlc3QgPSBzYXZpbmdzOwogCgo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYycKLS0tIGEvc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwkyMDEwLTA0LTA2IDEy
OjExOjQ2ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9oYW5kbGVyL2hhbmRsZXIw
YWx0ZXIuY2MJMjAxMC0wNC0yMSAxMDowMDoyOSArMDAwMApAQCAtOTIwLDkgKzkyMCw4IEBAIGNv
bnZlcnRfZXJyb3I6CiAJCXRyeF9jb21taXRfZm9yX215c3FsKHByZWJ1aWx0LT50cngpOwogCX0K
IAotCXV0X2QoZGljdF90YWJsZV9jaGVja19mb3JfZHVwX2luZGV4ZXMoaW5ub2RiX3RhYmxlLCBG
QUxTRSkpOwotCiAJaWYgKGRpY3RfbG9ja2VkKSB7CisJCXV0X2QoZGljdF90YWJsZV9jaGVja19m
b3JfZHVwX2luZGV4ZXMoaW5ub2RiX3RhYmxlLCBGQUxTRSkpOwogCQlyb3dfbXlzcWxfdW5sb2Nr
X2RhdGFfZGljdGlvbmFyeSh0cngpOwogCX0KIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9yZW0vcmVtMHJlYy5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
cmVtL3JlbTByZWMuYwkyMDEwLTA0LTIxIDA5OjE2OjExICswMDAwCisrKyBiL3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9yZW0vcmVtMHJlYy5jCTIwMTAtMDQtMjEgMDk6NTA6MzMgKzAwMDAKQEAgLTIx
Miw2ICsyMTIsMTMgQEAgcmVjX2dldF9uX2V4dGVybl9uZXcoCiAJCQljb25zdCBkaWN0X2NvbF90
Kgljb2wKIAkJCQk9IGRpY3RfZmllbGRfZ2V0X2NvbChmaWVsZCk7CiAJCQlsZW4gPSAqbGVucy0t
OworCQkJLyogSWYgdGhlIG1heGltdW0gbGVuZ3RoIG9mIHRoZSBmaWVsZCBpcyB1cAorCQkJdG8g
MjU1IGJ5dGVzLCB0aGUgYWN0dWFsIGxlbmd0aCBpcyBhbHdheXMKKwkJCXN0b3JlZCBpbiBvbmUg
Ynl0ZS4gSWYgdGhlIG1heGltdW0gbGVuZ3RoIGlzCisJCQltb3JlIHRoYW4gMjU1IGJ5dGVzLCB0
aGUgYWN0dWFsIGxlbmd0aCBpcworCQkJc3RvcmVkIGluIG9uZSBieXRlIGZvciAwLi4xMjcuICBU
aGUgbGVuZ3RoCisJCQl3aWxsIGJlIGVuY29kZWQgaW4gdHdvIGJ5dGVzIHdoZW4gaXQgaXMgMTI4
IG9yCisJCQltb3JlLCBvciB3aGVuIHRoZSBmaWVsZCBpcyBzdG9yZWQgZXh0ZXJuYWxseS4gKi8K
IAkJCWlmIChVTklWX1VOTElLRUxZKGNvbC0+bGVuID4gMjU1KQogCQkJICAgIHx8IFVOSVZfVU5M
SUtFTFkoY29sLT5tdHlwZSA9PSBEQVRBX0JMT0IpKSB7CiAJCQkJaWYgKGxlbiAmIDB4ODApIHsK
QEAgLTI5NCw2ICszMDEsMTMgQEAgcmVjX2luaXRfb2Zmc2V0c19jb21wX29yZGluYXJ5KAogCQkJ
Y29uc3QgZGljdF9jb2xfdCoJY29sCiAJCQkJPSBkaWN0X2ZpZWxkX2dldF9jb2woZmllbGQpOwog
CQkJbGVuID0gKmxlbnMtLTsKKwkJCS8qIElmIHRoZSBtYXhpbXVtIGxlbmd0aCBvZiB0aGUgZmll
bGQgaXMgdXAKKwkJCXRvIDI1NSBieXRlcywgdGhlIGFjdHVhbCBsZW5ndGggaXMgYWx3YXlzCisJ
CQlzdG9yZWQgaW4gb25lIGJ5dGUuIElmIHRoZSBtYXhpbXVtIGxlbmd0aCBpcworCQkJbW9yZSB0
aGFuIDI1NSBieXRlcywgdGhlIGFjdHVhbCBsZW5ndGggaXMKKwkJCXN0b3JlZCBpbiBvbmUgYnl0
ZSBmb3IgMC4uMTI3LiAgVGhlIGxlbmd0aAorCQkJd2lsbCBiZSBlbmNvZGVkIGluIHR3byBieXRl
cyB3aGVuIGl0IGlzIDEyOCBvcgorCQkJbW9yZSwgb3Igd2hlbiB0aGUgZmllbGQgaXMgc3RvcmVk
IGV4dGVybmFsbHkuICovCiAJCQlpZiAoVU5JVl9VTkxJS0VMWShjb2wtPmxlbiA+IDI1NSkKIAkJ
CSAgICB8fCBVTklWX1VOTElLRUxZKGNvbC0+bXR5cGUKIAkJCQkJICAgICA9PSBEQVRBX0JMT0Ip
KSB7CkBAIC00MjUsNiArNDM5LDE1IEBAIHJlY19pbml0X29mZnNldHMoCiAJCQkJY29uc3QgZGlj
dF9jb2xfdCoJY29sCiAJCQkJCT0gZGljdF9maWVsZF9nZXRfY29sKGZpZWxkKTsKIAkJCQlsZW4g
PSAqbGVucy0tOworCQkJCS8qIElmIHRoZSBtYXhpbXVtIGxlbmd0aCBvZiB0aGUgZmllbGQKKwkJ
CQlpcyB1cCB0byAyNTUgYnl0ZXMsIHRoZSBhY3R1YWwgbGVuZ3RoCisJCQkJaXMgYWx3YXlzIHN0
b3JlZCBpbiBvbmUgYnl0ZS4gSWYgdGhlCisJCQkJbWF4aW11bSBsZW5ndGggaXMgbW9yZSB0aGFu
IDI1NSBieXRlcywKKwkJCQl0aGUgYWN0dWFsIGxlbmd0aCBpcyBzdG9yZWQgaW4gb25lCisJCQkJ
Ynl0ZSBmb3IgMC4uMTI3LiAgVGhlIGxlbmd0aCB3aWxsIGJlCisJCQkJZW5jb2RlZCBpbiB0d28g
Ynl0ZXMgd2hlbiBpdCBpcyAxMjggb3IKKwkJCQltb3JlLCBvciB3aGVuIHRoZSBmaWVsZCBpcyBz
dG9yZWQKKwkJCQlleHRlcm5hbGx5LiAqLwogCQkJCWlmIChVTklWX1VOTElLRUxZKGNvbC0+bGVu
ID4gMjU1KQogCQkJCSAgICB8fCBVTklWX1VOTElLRUxZKGNvbC0+bXR5cGUKIAkJCQkJCSAgICAg
PT0gREFUQV9CTE9CKSkgewpAQCAtNjQ3LDYgKzY3MCwxMyBAQCByZWNfZ2V0X29mZnNldHNfcmV2
ZXJzZSgKIAkJCWNvbnN0IGRpY3RfY29sX3QqCWNvbAogCQkJCT0gZGljdF9maWVsZF9nZXRfY29s
KGZpZWxkKTsKIAkJCWxlbiA9ICpsZW5zKys7CisJCQkvKiBJZiB0aGUgbWF4aW11bSBsZW5ndGgg
b2YgdGhlIGZpZWxkIGlzIHVwCisJCQl0byAyNTUgYnl0ZXMsIHRoZSBhY3R1YWwgbGVuZ3RoIGlz
IGFsd2F5cworCQkJc3RvcmVkIGluIG9uZSBieXRlLiBJZiB0aGUgbWF4aW11bSBsZW5ndGggaXMK
KwkJCW1vcmUgdGhhbiAyNTUgYnl0ZXMsIHRoZSBhY3R1YWwgbGVuZ3RoIGlzCisJCQlzdG9yZWQg
aW4gb25lIGJ5dGUgZm9yIDAuLjEyNy4gIFRoZSBsZW5ndGgKKwkJCXdpbGwgYmUgZW5jb2RlZCBp
biB0d28gYnl0ZXMgd2hlbiBpdCBpcyAxMjggb3IKKwkJCW1vcmUsIG9yIHdoZW4gdGhlIGZpZWxk
IGlzIHN0b3JlZCBleHRlcm5hbGx5LiAqLwogCQkJaWYgKFVOSVZfVU5MSUtFTFkoY29sLT5sZW4g
PiAyNTUpCiAJCQkgICAgfHwgVU5JVl9VTkxJS0VMWShjb2wtPm10eXBlID09IERBVEFfQkxPQikp
IHsKIAkJCQlpZiAobGVuICYgMHg4MCkgewpAQCAtNzgxLDEyICs4MTEsMjAgQEAgcmVjX2dldF9j
b252ZXJ0ZWRfc2l6ZV9jb21wX3ByZWZpeCgKIAogCQl1dF9hZChsZW4gPD0gY29sLT5sZW4gfHwg
Y29sLT5tdHlwZSA9PSBEQVRBX0JMT0IpOwogCisJCS8qIElmIHRoZSBtYXhpbXVtIGxlbmd0aCBv
ZiBhIHZhcmlhYmxlLWxlbmd0aCBmaWVsZAorCQlpcyB1cCB0byAyNTUgYnl0ZXMsIHRoZSBhY3R1
YWwgbGVuZ3RoIGlzIGFsd2F5cyBzdG9yZWQKKwkJaW4gb25lIGJ5dGUuIElmIHRoZSBtYXhpbXVt
IGxlbmd0aCBpcyBtb3JlIHRoYW4gMjU1CisJCWJ5dGVzLCB0aGUgYWN0dWFsIGxlbmd0aCBpcyBz
dG9yZWQgaW4gb25lIGJ5dGUgZm9yCisJCTAuLjEyNy4gIFRoZSBsZW5ndGggd2lsbCBiZSBlbmNv
ZGVkIGluIHR3byBieXRlcyB3aGVuCisJCWl0IGlzIDEyOCBvciBtb3JlLCBvciB3aGVuIHRoZSBm
aWVsZCBpcyBzdG9yZWQgZXh0ZXJuYWxseS4gKi8KKwogCQlpZiAoZmllbGQtPmZpeGVkX2xlbikg
ewogCQkJdXRfYWQobGVuID09IGZpZWxkLT5maXhlZF9sZW4pOwogCQkJLyogZGljdF9pbmRleF9h
ZGRfY29sKCkgc2hvdWxkIGd1YXJhbnRlZSB0aGlzICovCiAJCQl1dF9hZCghZmllbGQtPnByZWZp
eF9sZW4KIAkJCSAgICAgIHx8IGZpZWxkLT5maXhlZF9sZW4gPT0gZmllbGQtPnByZWZpeF9sZW4p
OwogCQl9IGVsc2UgaWYgKGRmaWVsZF9pc19leHQoJmZpZWxkc1tpXSkpIHsKKwkJCXV0X2FkKGNv
bC0+bGVuID49IDI1NiB8fCBjb2wtPm10eXBlID09IERBVEFfQkxPQik7CiAJCQlleHRyYV9zaXpl
ICs9IDI7CiAJCX0gZWxzZSBpZiAobGVuIDwgMTI4CiAJCQkgICB8fCAoY29sLT5sZW4gPCAyNTYg
JiYgY29sLT5tdHlwZSAhPSBEQVRBX0JMT0IpKSB7CkBAIC0xMDg2LDYgKzExMjQsOCBAQCByZWNf
Y29udmVydF9kdHVwbGVfdG9fcmVjX2NvbXAoCiAJLyogU3RvcmUgdGhlIGRhdGEgYW5kIHRoZSBv
ZmZzZXRzICovCiAKIAlmb3IgKGkgPSAwLCBmaWVsZCA9IGZpZWxkczsgaSA8IG5fZmllbGRzOyBp
KyssIGZpZWxkKyspIHsKKwkJY29uc3QgZGljdF9maWVsZF90KglpZmllbGQ7CisKIAkJdHlwZSA9
IGRmaWVsZF9nZXRfdHlwZShmaWVsZCk7CiAJCWxlbiA9IGRmaWVsZF9nZXRfbGVuKGZpZWxkKTsK
IApAQCAtMTEyMCwxMiArMTE2MCwyMCBAQCByZWNfY29udmVydF9kdHVwbGVfdG9fcmVjX2NvbXAo
CiAJCS8qIG9ubHkgbnVsbGFibGUgZmllbGRzIGNhbiBiZSBudWxsICovCiAJCXV0X2FkKCFkZmll
bGRfaXNfbnVsbChmaWVsZCkpOwogCi0JCWZpeGVkX2xlbiA9IGRpY3RfaW5kZXhfZ2V0X250aF9m
aWVsZChpbmRleCwgaSktPmZpeGVkX2xlbjsKLQorCQlpZmllbGQgPSBkaWN0X2luZGV4X2dldF9u
dGhfZmllbGQoaW5kZXgsIGkpOworCQlmaXhlZF9sZW4gPSBpZmllbGQtPmZpeGVkX2xlbjsKKwkJ
LyogSWYgdGhlIG1heGltdW0gbGVuZ3RoIG9mIGEgdmFyaWFibGUtbGVuZ3RoIGZpZWxkCisJCWlz
IHVwIHRvIDI1NSBieXRlcywgdGhlIGFjdHVhbCBsZW5ndGggaXMgYWx3YXlzIHN0b3JlZAorCQlp
biBvbmUgYnl0ZS4gSWYgdGhlIG1heGltdW0gbGVuZ3RoIGlzIG1vcmUgdGhhbiAyNTUKKwkJYnl0
ZXMsIHRoZSBhY3R1YWwgbGVuZ3RoIGlzIHN0b3JlZCBpbiBvbmUgYnl0ZSBmb3IKKwkJMC4uMTI3
LiAgVGhlIGxlbmd0aCB3aWxsIGJlIGVuY29kZWQgaW4gdHdvIGJ5dGVzIHdoZW4KKwkJaXQgaXMg
MTI4IG9yIG1vcmUsIG9yIHdoZW4gdGhlIGZpZWxkIGlzIHN0b3JlZCBleHRlcm5hbGx5LiAqLwog
CQlpZiAoZml4ZWRfbGVuKSB7CiAJCQl1dF9hZChsZW4gPT0gZml4ZWRfbGVuKTsKIAkJCXV0X2Fk
KCFkZmllbGRfaXNfZXh0KGZpZWxkKSk7CiAJCX0gZWxzZSBpZiAoZGZpZWxkX2lzX2V4dChmaWVs
ZCkpIHsKKwkJCXV0X2FkKGlmaWVsZC0+Y29sLT5sZW4gPj0gMjU2CisJCQkgICAgICB8fCBpZmll
bGQtPmNvbC0+bXR5cGUgPT0gREFUQV9CTE9CKTsKIAkJCXV0X2FkKGxlbiA8PSBSRUNfTUFYX0lO
REVYX0NPTF9MRU4KIAkJCSAgICAgICsgQlRSX0VYVEVSTl9GSUVMRF9SRUZfU0laRSk7CiAJCQkq
bGVucy0tID0gKGJ5dGUpIChsZW4gPj4gOCkgfCAweGMwOwpAQCAtMTQxMSw2ICsxNDU5LDEzIEBA
IHJlY19jb3B5X3ByZWZpeF90b19idWYoCiAJCQlwcmVmaXhfbGVuICs9IGZpZWxkLT5maXhlZF9s
ZW47CiAJCX0gZWxzZSB7CiAJCQl1bGludAlsZW4gPSAqbGVucy0tOworCQkJLyogSWYgdGhlIG1h
eGltdW0gbGVuZ3RoIG9mIHRoZSBjb2x1bW4gaXMgdXAKKwkJCXRvIDI1NSBieXRlcywgdGhlIGFj
dHVhbCBsZW5ndGggaXMgYWx3YXlzCisJCQlzdG9yZWQgaW4gb25lIGJ5dGUuIElmIHRoZSBtYXhp
bXVtIGxlbmd0aCBpcworCQkJbW9yZSB0aGFuIDI1NSBieXRlcywgdGhlIGFjdHVhbCBsZW5ndGgg
aXMKKwkJCXN0b3JlZCBpbiBvbmUgYnl0ZSBmb3IgMC4uMTI3LiAgVGhlIGxlbmd0aAorCQkJd2ls
bCBiZSBlbmNvZGVkIGluIHR3byBieXRlcyB3aGVuIGl0IGlzIDEyOCBvcgorCQkJbW9yZSwgb3Ig
d2hlbiB0aGUgY29sdW1uIGlzIHN0b3JlZCBleHRlcm5hbGx5LiAqLwogCQkJaWYgKGNvbC0+bGVu
ID4gMjU1IHx8IGNvbC0+bXR5cGUgPT0gREFUQV9CTE9CKSB7CiAJCQkJaWYgKGxlbiAmIDB4ODAp
IHsKIAkJCQkJLyogMWV4eHh4eHggKi8KCg==

--===============1447263401==
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/mysql/5.1-innodb/
# testament_sha1: a24efddd0226c7a5b619cbf5b56f7c9737fb0205
# timestamp: 2010-04-21 13:01:54 +0300
# base_revision_id: marko.makela@stripped\
#   ir4glqk46qvg2ywn
# 
# Begin bundle
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
EKrmN0r/8XckU4UJBpzYdDA=


--===============1447263401==--