From: marko.makela
Date: June 24 2010 9:39am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3523) Bug#54679
List-Archive: http://lists.mysql.com/commits/112042
X-Bug: 54679
Message-Id: <201006240939.o5O98aC5013427@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0810915698=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDA2MjQwMjEwMTAtb2gyaG5w
OGUxeGJhYXg2dQoKIDM1MjMgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0yNAogICAgICBCdWcgIzU0
Njc5OiBhbHRlciB0YWJsZSBjYXVzZXMgY29tcHJlc3NlZCByb3dfZm9ybWF0IHRvIHJldmVydCB0
byBjb21wYWN0CiAgICAgIAogICAgICBoYV9pbm5vYmFzZTo6Y3JlYXRlKCk6IEFkZCB0aGUgbG9j
YWwgdmFyaWFibGUgcm93X3R5cGUgPSBmb3JtLT5zLT5yb3dfdHlwZS4KICAgICAgQWRqdXN0IGl0
IHRvIFJPV19UWVBFX0NPTVBSRVNTRUQgd2hlbiBST1dfRk9STUFUIGlzIG5vdCBzcGVjaWZpZWQg
b3IgaW5oZXJpdGVkCiAgICAgIGJ1dCBLRVlfQkxPQ0tfU0laRSBpcy4gT2JzZXJ2ZSB0aGUgaW5o
ZXJpdGVkIFJPV19GT1JNQVQgZXZlbiB3aGVuIGl0IGlzIG5vdAogICAgICBleHBsaWNpdGx5IHNw
ZWNpZmllZC4KCiAgICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2lu
L3IvaW5ub2RiX2J1ZzU0Njc5LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9w
bHVnaW4vdC9pbm5vZGJfYnVnNTQ2NzkudGVzdAogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9oYW5kbGVyL2hhX2lubm9kYi5jYwo9PT0gYWRkZWQgZmlsZSAnbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzU0Njc5LnJlc3VsdCcKLS0tIGEv
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzU0Njc5LnJlc3VsdAkx
OTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3Bs
dWdpbi9yL2lubm9kYl9idWc1NDY3OS5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDA2MjQwOTM5MjYtcHBlazI5amxsaTIxb3g3ZApAQCAtMCwwICsxLDE2IEBACitTRVQg
R0xPQkFMIGlubm9kYl9maWxlX2Zvcm1hdD0nQmFycmFjdWRhJzsKK1NFVCBHTE9CQUwgaW5ub2Ri
X2ZpbGVfcGVyX3RhYmxlPU9OOworQ1JFQVRFIFRBQkxFIGJ1ZzU0Njc5IChhIElOVCkgRU5HSU5F
PUlubm9EQiBST1dfRk9STUFUPUNPTVBSRVNTRUQ7CitTRUxFQ1QgVEFCTEVfTkFNRSxST1dfRk9S
TUFULENSRUFURV9PUFRJT05TIEZST00gaW5mb3JtYXRpb25fc2NoZW1hLnRhYmxlcworV0hFUkUg
VEFCTEVfTkFNRT0nYnVnNTQ2NzknOworVEFCTEVfTkFNRQlST1dfRk9STUFUCUNSRUFURV9PUFRJ
T05TCitidWc1NDY3OQlDb21wcmVzc2VkCXJvd19mb3JtYXQ9Q09NUFJFU1NFRAorQUxURVIgVEFC
TEUgYnVnNTQ2NzkgQUREIENPTFVNTiBiIElOVDsKK1NFTEVDVCBUQUJMRV9OQU1FLFJPV19GT1JN
QVQsQ1JFQVRFX09QVElPTlMgRlJPTSBpbmZvcm1hdGlvbl9zY2hlbWEudGFibGVzCitXSEVSRSBU
QUJMRV9OQU1FPSdidWc1NDY3OSc7CitUQUJMRV9OQU1FCVJPV19GT1JNQVQJQ1JFQVRFX09QVElP
TlMKK2J1ZzU0Njc5CUNvbXByZXNzZWQJcm93X2Zvcm1hdD1DT01QUkVTU0VECitEUk9QIFRBQkxF
IGJ1ZzU0Njc5OworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXQ9QW50ZWxvcGU7CitTRVQg
R0xPQkFMIGlubm9kYl9maWxlX2Zvcm1hdF9jaGVjaz1BbnRlbG9wZTsKK1NFVCBHTE9CQUwgaW5u
b2RiX2ZpbGVfcGVyX3RhYmxlPTA7Cgo9PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzU0Njc5LnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3Vp
dGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc1NDY3OS50ZXN0CTE5NzAtMDEtMDEgMDA6MDA6
MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1
ZzU0Njc5LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjQwOTM5MjYt
cHBlazI5amxsaTIxb3g3ZApAQCAtMCwwICsxLDIwIEBACistLXNvdXJjZSBpbmNsdWRlL2hhdmVf
aW5ub2RiX3BsdWdpbi5pbmMKKworbGV0ICRmaWxlX2Zvcm1hdD1gc2VsZWN0IEBAaW5ub2RiX2Zp
bGVfZm9ybWF0YDsKK2xldCAkZmlsZV9mb3JtYXRfY2hlY2s9YHNlbGVjdCBAQGlubm9kYl9maWxl
X2Zvcm1hdF9jaGVja2A7CitsZXQgJGZpbGVfcGVyX3RhYmxlPWBzZWxlY3QgQEBpbm5vZGJfZmls
ZV9wZXJfdGFibGVgOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXQ9J0JhcnJhY3VkYSc7
CitTRVQgR0xPQkFMIGlubm9kYl9maWxlX3Blcl90YWJsZT1PTjsKKworQ1JFQVRFIFRBQkxFIGJ1
ZzU0Njc5IChhIElOVCkgRU5HSU5FPUlubm9EQiBST1dfRk9STUFUPUNPTVBSRVNTRUQ7CitTRUxF
Q1QgVEFCTEVfTkFNRSxST1dfRk9STUFULENSRUFURV9PUFRJT05TIEZST00gaW5mb3JtYXRpb25f
c2NoZW1hLnRhYmxlcworV0hFUkUgVEFCTEVfTkFNRT0nYnVnNTQ2NzknOworQUxURVIgVEFCTEUg
YnVnNTQ2NzkgQUREIENPTFVNTiBiIElOVDsKK1NFTEVDVCBUQUJMRV9OQU1FLFJPV19GT1JNQVQs
Q1JFQVRFX09QVElPTlMgRlJPTSBpbmZvcm1hdGlvbl9zY2hlbWEudGFibGVzCitXSEVSRSBUQUJM
RV9OQU1FPSdidWc1NDY3OSc7CisKK0RST1AgVEFCTEUgYnVnNTQ2Nzk7CisKK0VWQUwgU0VUIEdM
T0JBTCBpbm5vZGJfZmlsZV9mb3JtYXQ9JGZpbGVfZm9ybWF0OworRVZBTCBTRVQgR0xPQkFMIGlu
bm9kYl9maWxlX2Zvcm1hdF9jaGVjaz0kZmlsZV9mb3JtYXRfY2hlY2s7CitFVkFMIFNFVCBHTE9C
QUwgaW5ub2RiX2ZpbGVfcGVyX3RhYmxlPSRmaWxlX3Blcl90YWJsZTsKCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYV9pbm5vZGIuY2MnCi0tLSBhL3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDpqaW1teS55YW5n
QG9yYWNsZS5jb20tMjAxMDA2MjQwMjEwMTAtb2gyaG5wOGUxeGJhYXg2dQorKysgYi9zdG9yYWdl
L2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYV9pbm5vZGIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDA2MjQwOTM5MjYtcHBlazI5amxsaTIxb3g3ZApAQCAtNjQ2MCw2ICs2NDYw
LDcgQEAgaGFfaW5ub2Jhc2U6OmNyZWF0ZSgKIAljb25zdCB1bGludAlmaWxlX2Zvcm1hdCA9IHNy
dl9maWxlX2Zvcm1hdDsKIAljb25zdCBjaGFyKglzdG10OwogCXNpemVfdAkJc3RtdF9sZW47CisJ
ZW51bSByb3dfdHlwZQlyb3dfdHlwZTsKIAogCURCVUdfRU5URVIoImhhX2lubm9iYXNlOjpjcmVh
dGUiKTsKIApAQCAtNjU4MCw5NCArNjU4MSw5NCBAQCBoYV9pbm5vYmFzZTo6Y3JlYXRlKAogCQl9
CiAJfQogCi0JaWYgKGNyZWF0ZV9pbmZvLT51c2VkX2ZpZWxkcyAmIEhBX0NSRUFURV9VU0VEX1JP
V19GT1JNQVQpIHsKLQkJaWYgKGZsYWdzKSB7Ci0JCQkvKiBLRVlfQkxPQ0tfU0laRSB3YXMgc3Bl
Y2lmaWVkLiAqLwotCQkJaWYgKGZvcm0tPnMtPnJvd190eXBlICE9IFJPV19UWVBFX0NPTVBSRVNT
RUQpIHsKLQkJCQkvKiBST1dfRk9STUFUIG90aGVyIHRoYW4gQ09NUFJFU1NFRAotCQkJCWlnbm9y
ZXMgS0VZX0JMT0NLX1NJWkUuICBJdCBkb2VzIG5vdAotCQkJCW1ha2Ugc2Vuc2UgdG8gcmVqZWN0
IGNvbmZsaWN0aW5nCi0JCQkJS0VZX0JMT0NLX1NJWkUgYW5kIFJPV19GT1JNQVQsIGJlY2F1c2UK
LQkJCQlzdWNoIGNvbWJpbmF0aW9ucyBjYW4gYmUgb2J0YWluZWQKLQkJCQl3aXRoIEFMVEVSIFRB
QkxFIGFueXdheS4gKi8KLQkJCQlwdXNoX3dhcm5pbmdfcHJpbnRmKAotCQkJCQl0aGQsCi0JCQkJ
CU1ZU1FMX0VSUk9SOjpXQVJOX0xFVkVMX1dBUk4sCi0JCQkJCUVSX0lMTEVHQUxfSEFfQ1JFQVRF
X09QVElPTiwKLQkJCQkJIklubm9EQjogaWdub3JpbmcgS0VZX0JMT0NLX1NJWkU9JWx1IgotCQkJ
CQkiIHVubGVzcyBST1dfRk9STUFUPUNPTVBSRVNTRUQuIiwKLQkJCQkJY3JlYXRlX2luZm8tPmtl
eV9ibG9ja19zaXplKTsKLQkJCQlmbGFncyA9IDA7Ci0JCQl9Ci0JCX0gZWxzZSB7Ci0JCQkvKiBO
byBLRVlfQkxPQ0tfU0laRSAqLwotCQkJaWYgKGZvcm0tPnMtPnJvd190eXBlID09IFJPV19UWVBF
X0NPTVBSRVNTRUQpIHsKLQkJCQkvKiBST1dfRk9STUFUPUNPTVBSRVNTRUQgd2l0aG91dAotCQkJ
CUtFWV9CTE9DS19TSVpFIGltcGxpZXMgaGFsZiB0aGUKLQkJCQltYXhpbXVtIEtFWV9CTE9DS19T
SVpFLiAqLwotCQkJCWZsYWdzID0gKERJQ1RfVEZfWlNTSVpFX01BWCAtIDEpCi0JCQkJCTw8IERJ
Q1RfVEZfWlNTSVpFX1NISUZUCi0JCQkJCXwgRElDVF9URl9DT01QQUNUCi0JCQkJCXwgRElDVF9U
Rl9GT1JNQVRfWklQCi0JCQkJCTw8IERJQ1RfVEZfRk9STUFUX1NISUZUOworCXJvd190eXBlID0g
Zm9ybS0+cy0+cm93X3R5cGU7CisKKwlpZiAoZmxhZ3MpIHsKKwkJLyogS0VZX0JMT0NLX1NJWkUg
d2FzIHNwZWNpZmllZC4gKi8KKwkJaWYgKCEoY3JlYXRlX2luZm8tPnVzZWRfZmllbGRzICYgSEFf
Q1JFQVRFX1VTRURfUk9XX0ZPUk1BVCkpIHsKKwkJCS8qIFJPV19GT1JNQVQgd2FzIG5vdCBzcGVj
aWZpZWQ7CisJCQlkZWZhdWx0IHRvIFJPV19GT1JNQVQ9Q09NUFJFU1NFRCAqLworCQkJcm93X3R5
cGUgPSBST1dfVFlQRV9DT01QUkVTU0VEOworCQl9IGVsc2UgaWYgKHJvd190eXBlICE9IFJPV19U
WVBFX0NPTVBSRVNTRUQpIHsKKwkJCS8qIFJPV19GT1JNQVQgb3RoZXIgdGhhbiBDT01QUkVTU0VE
CisJCQlpZ25vcmVzIEtFWV9CTE9DS19TSVpFLiAgSXQgZG9lcyBub3QKKwkJCW1ha2Ugc2Vuc2Ug
dG8gcmVqZWN0IGNvbmZsaWN0aW5nCisJCQlLRVlfQkxPQ0tfU0laRSBhbmQgUk9XX0ZPUk1BVCwg
YmVjYXVzZQorCQkJc3VjaCBjb21iaW5hdGlvbnMgY2FuIGJlIG9idGFpbmVkCisJCQl3aXRoIEFM
VEVSIFRBQkxFIGFueXdheS4gKi8KKwkJCXB1c2hfd2FybmluZ19wcmludGYoCisJCQkJdGhkLAor
CQkJCU1ZU1FMX0VSUk9SOjpXQVJOX0xFVkVMX1dBUk4sCisJCQkJRVJfSUxMRUdBTF9IQV9DUkVB
VEVfT1BUSU9OLAorCQkJCSJJbm5vREI6IGlnbm9yaW5nIEtFWV9CTE9DS19TSVpFPSVsdSIKKwkJ
CQkiIHVubGVzcyBST1dfRk9STUFUPUNPTVBSRVNTRUQuIiwKKwkJCQljcmVhdGVfaW5mby0+a2V5
X2Jsb2NrX3NpemUpOworCQkJZmxhZ3MgPSAwOworCQl9CisJfSBlbHNlIHsKKwkJLyogTm8gS0VZ
X0JMT0NLX1NJWkUgKi8KKwkJaWYgKHJvd190eXBlID09IFJPV19UWVBFX0NPTVBSRVNTRUQpIHsK
KwkJCS8qIFJPV19GT1JNQVQ9Q09NUFJFU1NFRCB3aXRob3V0CisJCQlLRVlfQkxPQ0tfU0laRSBp
bXBsaWVzIGhhbGYgdGhlCisJCQltYXhpbXVtIEtFWV9CTE9DS19TSVpFLiAqLworCQkJZmxhZ3Mg
PSAoRElDVF9URl9aU1NJWkVfTUFYIC0gMSkKKwkJCQk8PCBESUNUX1RGX1pTU0laRV9TSElGVAor
CQkJCXwgRElDVF9URl9DT01QQUNUCisJCQkJfCBESUNUX1RGX0ZPUk1BVF9aSVAKKwkJCQk8PCBE
SUNUX1RGX0ZPUk1BVF9TSElGVDsKICNpZiBESUNUX1RGX1pTU0laRV9NQVggPCAxCiAjIGVycm9y
ICJESUNUX1RGX1pTU0laRV9NQVggPCAxIgogI2VuZGlmCi0JCQl9CiAJCX0KKwl9CiAKLQkJc3dp
dGNoIChmb3JtLT5zLT5yb3dfdHlwZSkgewotCQkJY29uc3QgY2hhciogcm93X2Zvcm1hdF9uYW1l
OwotCQljYXNlIFJPV19UWVBFX1JFRFVOREFOVDoKLQkJCWJyZWFrOwotCQljYXNlIFJPV19UWVBF
X0NPTVBSRVNTRUQ6Ci0JCWNhc2UgUk9XX1RZUEVfRFlOQU1JQzoKLQkJCXJvd19mb3JtYXRfbmFt
ZQotCQkJCT0gZm9ybS0+cy0+cm93X3R5cGUgPT0gUk9XX1RZUEVfQ09NUFJFU1NFRAotCQkJCT8g
IkNPTVBSRVNTRUQiCi0JCQkJOiAiRFlOQU1JQyI7Ci0KLQkJCWlmICghc3J2X2ZpbGVfcGVyX3Rh
YmxlKSB7Ci0JCQkJcHVzaF93YXJuaW5nX3ByaW50ZigKLQkJCQkJdGhkLAotCQkJCQlNWVNRTF9F
UlJPUjo6V0FSTl9MRVZFTF9XQVJOLAotCQkJCQlFUl9JTExFR0FMX0hBX0NSRUFURV9PUFRJT04s
Ci0JCQkJCSJJbm5vREI6IFJPV19GT1JNQVQ9JXMiCi0JCQkJCSIgcmVxdWlyZXMgaW5ub2RiX2Zp
bGVfcGVyX3RhYmxlLiIsCi0JCQkJCXJvd19mb3JtYXRfbmFtZSk7Ci0JCQl9IGVsc2UgaWYgKGZp
bGVfZm9ybWF0IDwgRElDVF9URl9GT1JNQVRfWklQKSB7Ci0JCQkJcHVzaF93YXJuaW5nX3ByaW50
ZigKLQkJCQkJdGhkLAotCQkJCQlNWVNRTF9FUlJPUjo6V0FSTl9MRVZFTF9XQVJOLAotCQkJCQlF
Ul9JTExFR0FMX0hBX0NSRUFURV9PUFRJT04sCi0JCQkJCSJJbm5vREI6IFJPV19GT1JNQVQ9JXMi
Ci0JCQkJCSIgcmVxdWlyZXMgaW5ub2RiX2ZpbGVfZm9ybWF0ID4iCi0JCQkJCSIgQW50ZWxvcGUu
IiwKLQkJCQkJcm93X2Zvcm1hdF9uYW1lKTsKLQkJCX0gZWxzZSB7Ci0JCQkJZmxhZ3MgfD0gRElD
VF9URl9DT01QQUNUCi0JCQkJCXwgKERJQ1RfVEZfRk9STUFUX1pJUAotCQkJCQkgICA8PCBESUNU
X1RGX0ZPUk1BVF9TSElGVCk7Ci0JCQkJYnJlYWs7Ci0JCQl9CisJc3dpdGNoIChyb3dfdHlwZSkg
eworCQljb25zdCBjaGFyKiByb3dfZm9ybWF0X25hbWU7CisJY2FzZSBST1dfVFlQRV9SRURVTkRB
TlQ6CisJCWJyZWFrOworCWNhc2UgUk9XX1RZUEVfQ09NUFJFU1NFRDoKKwljYXNlIFJPV19UWVBF
X0RZTkFNSUM6CisJCXJvd19mb3JtYXRfbmFtZQorCQkJPSByb3dfdHlwZSA9PSBST1dfVFlQRV9D
T01QUkVTU0VECisJCQk/ICJDT01QUkVTU0VEIgorCQkJOiAiRFlOQU1JQyI7CiAKLQkJCS8qIGZh
bGwgdGhyb3VnaCAqLwotCQljYXNlIFJPV19UWVBFX05PVF9VU0VEOgotCQljYXNlIFJPV19UWVBF
X0ZJWEVEOgotCQlkZWZhdWx0OgotCQkJcHVzaF93YXJuaW5nKHRoZCwKLQkJCQkgICAgIE1ZU1FM
X0VSUk9SOjpXQVJOX0xFVkVMX1dBUk4sCi0JCQkJICAgICBFUl9JTExFR0FMX0hBX0NSRUFURV9P
UFRJT04sCi0JCQkJICAgICAiSW5ub0RCOiBhc3N1bWluZyBST1dfRk9STUFUPUNPTVBBQ1QuIik7
Ci0JCWNhc2UgUk9XX1RZUEVfREVGQVVMVDoKLQkJY2FzZSBST1dfVFlQRV9DT01QQUNUOgotCQkJ
ZmxhZ3MgPSBESUNUX1RGX0NPTVBBQ1Q7CisJCWlmICghc3J2X2ZpbGVfcGVyX3RhYmxlKSB7CisJ
CQlwdXNoX3dhcm5pbmdfcHJpbnRmKAorCQkJCXRoZCwKKwkJCQlNWVNRTF9FUlJPUjo6V0FSTl9M
RVZFTF9XQVJOLAorCQkJCUVSX0lMTEVHQUxfSEFfQ1JFQVRFX09QVElPTiwKKwkJCQkiSW5ub0RC
OiBST1dfRk9STUFUPSVzIgorCQkJCSIgcmVxdWlyZXMgaW5ub2RiX2ZpbGVfcGVyX3RhYmxlLiIs
CisJCQkJcm93X2Zvcm1hdF9uYW1lKTsKKwkJfSBlbHNlIGlmIChmaWxlX2Zvcm1hdCA8IERJQ1Rf
VEZfRk9STUFUX1pJUCkgeworCQkJcHVzaF93YXJuaW5nX3ByaW50ZigKKwkJCQl0aGQsCisJCQkJ
TVlTUUxfRVJST1I6OldBUk5fTEVWRUxfV0FSTiwKKwkJCQlFUl9JTExFR0FMX0hBX0NSRUFURV9P
UFRJT04sCisJCQkJIklubm9EQjogUk9XX0ZPUk1BVD0lcyIKKwkJCQkiIHJlcXVpcmVzIGlubm9k
Yl9maWxlX2Zvcm1hdCA+IgorCQkJCSIgQW50ZWxvcGUuIiwKKwkJCQlyb3dfZm9ybWF0X25hbWUp
OworCQl9IGVsc2UgeworCQkJZmxhZ3MgfD0gRElDVF9URl9DT01QQUNUCisJCQkJfCAoRElDVF9U
Rl9GT1JNQVRfWklQCisJCQkJICAgPDwgRElDVF9URl9GT1JNQVRfU0hJRlQpOwogCQkJYnJlYWs7
CiAJCX0KLQl9IGVsc2UgaWYgKCFmbGFncykgewotCQkvKiBObyBLRVlfQkxPQ0tfU0laRSBvciBS
T1dfRk9STUFUIHNwZWNpZmllZDoKLQkJdXNlIFJPV19GT1JNQVQ9Q09NUEFDVCBieSBkZWZhdWx0
LiAqLworCisJCS8qIGZhbGwgdGhyb3VnaCAqLworCWNhc2UgUk9XX1RZUEVfTk9UX1VTRUQ6CisJ
Y2FzZSBST1dfVFlQRV9GSVhFRDoKKwlkZWZhdWx0OgorCQlwdXNoX3dhcm5pbmcodGhkLAorCQkJ
ICAgICBNWVNRTF9FUlJPUjo6V0FSTl9MRVZFTF9XQVJOLAorCQkJICAgICBFUl9JTExFR0FMX0hB
X0NSRUFURV9PUFRJT04sCisJCQkgICAgICJJbm5vREI6IGFzc3VtaW5nIFJPV19GT1JNQVQ9Q09N
UEFDVC4iKTsKKwljYXNlIFJPV19UWVBFX0RFRkFVTFQ6CisJY2FzZSBST1dfVFlQRV9DT01QQUNU
OgogCQlmbGFncyA9IERJQ1RfVEZfQ09NUEFDVDsKKwkJYnJlYWs7CiAJfQogCiAJLyogTG9vayBm
b3IgYSBwcmltYXJ5IGtleSAqLwoK

--===============0810915698==
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: f748641de2febecf73d4c4d338cd2a7f039122ba
# timestamp: 2010-06-24 12:39:38 +0300
# base_revision_id: jimmy.yang@stripped\
#   oh2hnp8e1xbaax6u
# 
# Begin bundle
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
D7//F3JFOFCQ2h76MA==


--===============0810915698==--