From: marko.makela
Date: March 15 2011 10:01am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3717) Bug#11849231
List-Archive: http://lists.mysql.com/commits/132986
X-Bug: 11849231
Message-Id: <201103151001.p2FA1TsS017008@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0199179580=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMzAyMDg1OTQzLTJ5d2xy
eTQydW1kZmh3NWUKCiAzNzE3IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDMtMTUKICAgICAgQnVnIzEx
ODQ5MjMxIGluZmxhdGVJbml0KCkgaW52b2tlZCB3aXRob3V0IGluaXRpYWxpemluZyBhbGwgbWVt
b3J5CiAgICAgIAogICAgICBBY2NvcmRpbmcgdG8gdGhlIHpsaWIgZG9jdW1lbnRhdGlvbiwgbmV4
dF9pbiBhbmQgYXZhaWxfaW4KICAgICAgbXVzdCBiZSBpbml0aWFsaXplZCBiZWZvcmUgaW52b2tp
bmcgaW5mbGF0ZUluaXQgb3IgaW5mbGF0ZUluaXQyLgogICAgICBGdXJ0aGVybW9yZSwgdGhlIHph
bGxvYyBmdW5jdGlvbiBtdXN0IGNsZWFyIHRoZSBhbGxvY2F0ZWQgbWVtb3J5LgogICAgICAKICAg
ICAgYnRyX2NvcHlfemJsb2JfcHJlZml4KCk6IFJlcGxhY2UgdGhlIGRfc3RyZWFtIHBhcmFtZXRl
ciB3aXRoIGJ1ZixsZW4KICAgICAgYW5kIHJldHVybiB0aGUgY29waWVkIGxlbmd0aC4KICAgICAg
CiAgICAgIHBhZ2VfemlwX2RlY29tcHJlc3MoKTogSW52b2tlIGluZmxhdGVJbml0MiBhIGxpdHRs
ZSBsYXRlci4KICAgICAgCiAgICAgIHBhZ2VfemlwX3phbGxvYygpOiBSZW5hbWUgZnJvbSBwYWdl
X3ppcF9hbGxvYygpLgogICAgICBJbnZva2UgbWVtX2hlYXBfemFsbG9jKCkgaW5zdGVhZCBvZiBt
ZW1faGVhcF9hbGxvYygpLgogICAgICAKICAgICAgcmI6NjE5IGFwcHJvdmVkIGJ5IEppbW15IFlh
bmcKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwog
ICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBjdXIuYwogICAgICBzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vcGFnZS9wYWdlMHppcC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdl
TG9nCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAzMDIwODU5NDMtMnl3bHJ5NDJ1
bWRmaHc1ZQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMzE1MTAwMTAyLXkxY3JhbHJhOWxheDZ3eWUKQEAgLTEs
MyArMSw4IEBACisyMDExLTAzLTE1CVRoZSBJbm5vREIgVGVhbQorCisJKiBidHIvYnRyMGN1ci5j
LCBwYWdlL3BhZ2UwemlwLmM6CisJRml4IEJ1ZyMxMTg0OTIzMSBpbmZsYXRlSW5pdCgpIGludm9r
ZWQgd2l0aG91dCBpbml0aWFsaXppbmcgYWxsIG1lbW9yeQorCiAyMDExLTAyLTI4CVRoZSBJbm5v
REIgVGVhbQogCiAJKiBidHIvYnRyMHNlYS5jLCBidWYvYnVmMGJ1Zi5jLCBidWYvYnVmMGxydS5j
OgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1ci5j
JwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBjdXIuYwlyZXZpZDp2YXNpbC5k
aW1vdkBvcmFjbGUuY29tLTIwMTEwMzAyMDg1OTQzLTJ5d2xyeTQydW1kZmh3NWUKKysrIGIvc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTAzMTUxMDAxMDIteTFjcmFscmE5bGF4Nnd5ZQpAQCAtNDYyNywyNyArNDYyNyw0
NSBAQCBidHJfY29weV9ibG9iX3ByZWZpeCgKIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBDb3BpZXMgdGhl
IHByZWZpeCBvZiBhIGNvbXByZXNzZWQgQkxPQi4gIFRoZSBjbHVzdGVyZWQgaW5kZXggcmVjb3Jk
Ci10aGF0IHBvaW50cyB0byB0aGlzIEJMT0IgbXVzdCBiZSBwcm90ZWN0ZWQgYnkgYSBsb2NrIG9y
IGEgcGFnZSBsYXRjaC4gKi8KK3RoYXQgcG9pbnRzIHRvIHRoaXMgQkxPQiBtdXN0IGJlIHByb3Rl
Y3RlZCBieSBhIGxvY2sgb3IgYSBwYWdlIGxhdGNoLgorQHJldHVybgludW1iZXIgb2YgYnl0ZXMg
d3JpdHRlbiB0byBidWYgKi8KIHN0YXRpYwotdm9pZAordWxpbnQKIGJ0cl9jb3B5X3pibG9iX3By
ZWZpeCgKIC8qPT09PT09PT09PT09PT09PT09Ki8KLQl6X3N0cmVhbSoJZF9zdHJlYW0sLyohPCBp
bi9vdXQ6IHRoZSBkZWNvbXByZXNzaW5nIHN0cmVhbSAqLworCWJ5dGUqCQlidWYsCS8qITwgb3V0
OiB0aGUgZXh0ZXJuYWxseSBzdG9yZWQgcGFydCBvZgorCQkJCXRoZSBmaWVsZCwgb3IgYSBwcmVm
aXggb2YgaXQgKi8KKwl1bGludAkJbGVuLAkvKiE8IGluOiBsZW5ndGggb2YgYnVmLCBpbiBieXRl
cyAqLwogCXVsaW50CQl6aXBfc2l6ZSwvKiE8IGluOiBjb21wcmVzc2VkIEJMT0IgcGFnZSBzaXpl
ICovCiAJdWxpbnQJCXNwYWNlX2lkLC8qITwgaW46IHNwYWNlIGlkIG9mIHRoZSBCTE9CIHBhZ2Vz
ICovCiAJdWxpbnQJCXBhZ2Vfbm8sLyohPCBpbjogcGFnZSBudW1iZXIgb2YgdGhlIGZpcnN0IEJM
T0IgcGFnZSAqLwogCXVsaW50CQlvZmZzZXQpCS8qITwgaW46IG9mZnNldCBvbiB0aGUgZmlyc3Qg
QkxPQiBwYWdlICovCiB7Ci0JdWxpbnQJcGFnZV90eXBlID0gRklMX1BBR0VfVFlQRV9aQkxPQjsK
Kwl1bGludAkJcGFnZV90eXBlID0gRklMX1BBR0VfVFlQRV9aQkxPQjsKKwltZW1faGVhcF90Kglo
ZWFwOworCWludAkJZXJyOworCXpfc3RyZWFtCWRfc3RyZWFtOworCisJZF9zdHJlYW0ubmV4dF9v
dXQgPSBidWY7CisJZF9zdHJlYW0uYXZhaWxfb3V0ID0gbGVuOworCWRfc3RyZWFtLm5leHRfaW4g
PSBaX05VTEw7CisJZF9zdHJlYW0uYXZhaWxfaW4gPSAwOworCisJLyogWmxpYiBpbmZsYXRlIG5l
ZWRzIDMyIGtpbG9ieXRlcyBmb3IgdGhlIGRlZmF1bHQKKwl3aW5kb3cgc2l6ZSwgcGx1cyBhIGZl
dyBraWxvYnl0ZXMgZm9yIHNtYWxsIG9iamVjdHMuICovCisJaGVhcCA9IG1lbV9oZWFwX2NyZWF0
ZSg0MDAwMCk7CisJcGFnZV96aXBfc2V0X2FsbG9jKCZkX3N0cmVhbSwgaGVhcCk7CiAKIAl1dF9h
ZCh1dF9pc18ycG93KHppcF9zaXplKSk7CiAJdXRfYWQoemlwX3NpemUgPj0gUEFHRV9aSVBfTUlO
X1NJWkUpOwogCXV0X2FkKHppcF9zaXplIDw9IFVOSVZfUEFHRV9TSVpFKTsKIAl1dF9hZChzcGFj
ZV9pZCk7CiAKKwllcnIgPSBpbmZsYXRlSW5pdCgmZF9zdHJlYW0pOworCXV0X2EoZXJyID09IFpf
T0spOworCiAJZm9yICg7OykgewogCQlidWZfcGFnZV90KglicGFnZTsKLQkJaW50CQllcnI7CiAJ
CXVsaW50CQluZXh0X3BhZ2Vfbm87CiAKIAkJLyogVGhlcmUgaXMgbm8gbGF0Y2ggb24gYnBhZ2Ug
ZGlyZWN0bHkuICBJbnN0ZWFkLApAQCAtNDY2Myw3ICs0NjgxLDcgQEAgYnRyX2NvcHlfemJsb2Jf
cHJlZml4KAogCQkJCSIgY29tcHJlc3NlZCBCTE9CIgogCQkJCSIgcGFnZSAlbHUgc3BhY2UgJWx1
XG4iLAogCQkJCSh1bG9uZykgcGFnZV9ubywgKHVsb25nKSBzcGFjZV9pZCk7Ci0JCQlyZXR1cm47
CisJCQlnb3RvIGZ1bmNfZXhpdDsKIAkJfQogCiAJCWlmIChVTklWX1VOTElLRUxZCkBAIC00Njg5
LDEzICs0NzA3LDEzIEBAIGJ0cl9jb3B5X3pibG9iX3ByZWZpeCgKIAkJCW9mZnNldCArPSA0Owog
CQl9CiAKLQkJZF9zdHJlYW0tPm5leHRfaW4gPSBicGFnZS0+emlwLmRhdGEgKyBvZmZzZXQ7Ci0J
CWRfc3RyZWFtLT5hdmFpbF9pbiA9IHppcF9zaXplIC0gb2Zmc2V0OworCQlkX3N0cmVhbS5uZXh0
X2luID0gYnBhZ2UtPnppcC5kYXRhICsgb2Zmc2V0OworCQlkX3N0cmVhbS5hdmFpbF9pbiA9IHpp
cF9zaXplIC0gb2Zmc2V0OwogCi0JCWVyciA9IGluZmxhdGUoZF9zdHJlYW0sIFpfTk9fRkxVU0gp
OworCQllcnIgPSBpbmZsYXRlKCZkX3N0cmVhbSwgWl9OT19GTFVTSCk7CiAJCXN3aXRjaCAoZXJy
KSB7CiAJCWNhc2UgWl9PSzoKLQkJCWlmICghZF9zdHJlYW0tPmF2YWlsX291dCkgeworCQkJaWYg
KCFkX3N0cmVhbS5hdmFpbF9vdXQpIHsKIAkJCQlnb3RvIGVuZF9vZl9ibG9iOwogCQkJfQogCQkJ
YnJlYWs7CkBAIC00NzEyLDEzICs0NzMwLDEzIEBAIGluZmxhdGVfZXJyb3I6CiAJCQkJIiBjb21w
cmVzc2VkIEJMT0IiCiAJCQkJIiBwYWdlICVsdSBzcGFjZSAlbHUgcmV0dXJuZWQgJWQgKCVzKVxu
IiwKIAkJCQkodWxvbmcpIHBhZ2Vfbm8sICh1bG9uZykgc3BhY2VfaWQsCi0JCQkJZXJyLCBkX3N0
cmVhbS0+bXNnKTsKKwkJCQllcnIsIGRfc3RyZWFtLm1zZyk7CiAJCWNhc2UgWl9CVUZfRVJST1I6
CiAJCQlnb3RvIGVuZF9vZl9ibG9iOwogCQl9CiAKIAkJaWYgKG5leHRfcGFnZV9ubyA9PSBGSUxf
TlVMTCkgewotCQkJaWYgKCFkX3N0cmVhbS0+YXZhaWxfaW4pIHsKKwkJCWlmICghZF9zdHJlYW0u
YXZhaWxfaW4pIHsKIAkJCQl1dF9wcmludF90aW1lc3RhbXAoc3RkZXJyKTsKIAkJCQlmcHJpbnRm
KHN0ZGVyciwKIAkJCQkJIiAgSW5ub0RCOiB1bmV4cGVjdGVkIGVuZCBvZiIKQEAgLTQ3MjcsNyAr
NDc0NSw3IEBAIGluZmxhdGVfZXJyb3I6CiAJCQkJCSh1bG9uZykgcGFnZV9ubywKIAkJCQkJKHVs
b25nKSBzcGFjZV9pZCk7CiAJCQl9IGVsc2UgewotCQkJCWVyciA9IGluZmxhdGUoZF9zdHJlYW0s
IFpfRklOSVNIKTsKKwkJCQllcnIgPSBpbmZsYXRlKCZkX3N0cmVhbSwgWl9GSU5JU0gpOwogCQkJ
CXN3aXRjaCAoZXJyKSB7CiAJCQkJY2FzZSBaX1NUUkVBTV9FTkQ6CiAJCQkJY2FzZSBaX0JVRl9F
UlJPUjoKQEAgLTQ3MzksNyArNDc1Nyw3IEBAIGluZmxhdGVfZXJyb3I6CiAKIGVuZF9vZl9ibG9i
OgogCQkJYnVmX3BhZ2VfcmVsZWFzZV96aXAoYnBhZ2UpOwotCQkJcmV0dXJuOworCQkJZ290byBm
dW5jX2V4aXQ7CiAJCX0KIAogCQlidWZfcGFnZV9yZWxlYXNlX3ppcChicGFnZSk7CkBAIC00NzUx
LDYgKzQ3NjksMTIgQEAgZW5kX29mX2Jsb2I6CiAJCW9mZnNldCA9IEZJTF9QQUdFX05FWFQ7CiAJ
CXBhZ2VfdHlwZSA9IEZJTF9QQUdFX1RZUEVfWkJMT0IyOwogCX0KKworZnVuY19leGl0OgorCWlu
ZmxhdGVFbmQoJmRfc3RyZWFtKTsKKwltZW1faGVhcF9mcmVlKGhlYXApOworCVVOSVZfTUVNX0FT
U0VSVF9SVyhidWYsIGRfc3RyZWFtLnRvdGFsX291dCk7CisJcmV0dXJuKGRfc3RyZWFtLnRvdGFs
X291dCk7CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqLy8qKgpAQCAtNDc3NiwyOCArNDgwMCw4IEBAIGJ0cl9j
b3B5X2V4dGVybmFsbHlfc3RvcmVkX2ZpZWxkX3ByZWZpeF8KIAl9CiAKIAlpZiAoVU5JVl9VTkxJ
S0VMWSh6aXBfc2l6ZSkpIHsKLQkJaW50CQllcnI7Ci0JCXpfc3RyZWFtCWRfc3RyZWFtOwotCQlt
ZW1faGVhcF90KgloZWFwOwotCi0JCS8qIFpsaWIgaW5mbGF0ZSBuZWVkcyAzMiBraWxvYnl0ZXMg
Zm9yIHRoZSBkZWZhdWx0Ci0JCXdpbmRvdyBzaXplLCBwbHVzIGEgZmV3IGtpbG9ieXRlcyBmb3Ig
c21hbGwgb2JqZWN0cy4gKi8KLQkJaGVhcCA9IG1lbV9oZWFwX2NyZWF0ZSg0MDAwMCk7Ci0JCXBh
Z2VfemlwX3NldF9hbGxvYygmZF9zdHJlYW0sIGhlYXApOwotCi0JCWVyciA9IGluZmxhdGVJbml0
KCZkX3N0cmVhbSk7Ci0JCXV0X2EoZXJyID09IFpfT0spOwotCi0JCWRfc3RyZWFtLm5leHRfb3V0
ID0gYnVmOwotCQlkX3N0cmVhbS5hdmFpbF9vdXQgPSBsZW47Ci0JCWRfc3RyZWFtLmF2YWlsX2lu
ID0gMDsKLQotCQlidHJfY29weV96YmxvYl9wcmVmaXgoJmRfc3RyZWFtLCB6aXBfc2l6ZSwKLQkJ
CQkgICAgICBzcGFjZV9pZCwgcGFnZV9ubywgb2Zmc2V0KTsKLQkJaW5mbGF0ZUVuZCgmZF9zdHJl
YW0pOwotCQltZW1faGVhcF9mcmVlKGhlYXApOwotCQlVTklWX01FTV9BU1NFUlRfUlcoYnVmLCBk
X3N0cmVhbS50b3RhbF9vdXQpOwotCQlyZXR1cm4oZF9zdHJlYW0udG90YWxfb3V0KTsKKwkJcmV0
dXJuKGJ0cl9jb3B5X3pibG9iX3ByZWZpeChidWYsIGxlbiwgemlwX3NpemUsCisJCQkJCSAgICAg
c3BhY2VfaWQsIHBhZ2Vfbm8sIG9mZnNldCkpOwogCX0gZWxzZSB7CiAJCXJldHVybihidHJfY29w
eV9ibG9iX3ByZWZpeChidWYsIGxlbiwgc3BhY2VfaWQsCiAJCQkJCSAgICBwYWdlX25vLCBvZmZz
ZXQpKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcGFnZS9wYWdl
MHppcC5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcGFnZS9wYWdlMHppcC5jCXJldmlk
OnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTAzMDIwODU5NDMtMnl3bHJ5NDJ1bWRmaHc1ZQor
KysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcGFnZS9wYWdlMHppcC5jCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTEwMzE1MTAwMTAyLXkxY3JhbHJhOWxheDZ3eWUKQEAgLTY1Mywx
MyArNjUzLDEzIEBAIHBhZ2VfemlwX2Rpcl9lbmNvZGUoCiBBbGxvY2F0ZSBtZW1vcnkgZm9yIHps
aWIuICovCiBzdGF0aWMKIHZvaWQqCi1wYWdlX3ppcF9tYWxsb2MoCitwYWdlX3ppcF96YWxsb2Mo
CiAvKj09PT09PT09PT09PSovCiAJdm9pZCoJb3BhcXVlLAkvKiE8IGluL291dDogbWVtb3J5IGhl
YXAgKi8KIAl1SW50CWl0ZW1zLAkvKiE8IGluOiBudW1iZXIgb2YgaXRlbXMgdG8gYWxsb2NhdGUg
Ki8KIAl1SW50CXNpemUpCS8qITwgaW46IHNpemUgb2YgYW4gaXRlbSBpbiBieXRlcyAqLwogewot
CXJldHVybihtZW1faGVhcF9hbGxvYyhvcGFxdWUsIGl0ZW1zICogc2l6ZSkpOworCXJldHVybiht
ZW1faGVhcF96YWxsb2Mob3BhcXVlLCBpdGVtcyAqIHNpemUpKTsKIH0KIAogLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KiovLyoqCkBAIC02ODQsNyArNjg0LDcgQEAgcGFnZV96aXBfc2V0X2FsbG9jKAogewogCXpfc3Ry
ZWFtKglzdHJtID0gc3RyZWFtOwogCi0Jc3RybS0+emFsbG9jID0gcGFnZV96aXBfbWFsbG9jOwor
CXN0cm0tPnphbGxvYyA9IHBhZ2VfemlwX3phbGxvYzsKIAlzdHJtLT56ZnJlZSA9IHBhZ2Vfemlw
X2ZyZWU7CiAJc3RybS0+b3BhcXVlID0gaGVhcDsKIH0KQEAgLTI5MTIsMTkgKzI5MTIsMTggQEAg
emxpYl9lcnJvcjoKIAogCXBhZ2VfemlwX3NldF9hbGxvYygmZF9zdHJlYW0sIGhlYXApOwogCi0J
aWYgKFVOSVZfVU5MSUtFTFkoaW5mbGF0ZUluaXQyKCZkX3N0cmVhbSwgVU5JVl9QQUdFX1NJWkVf
U0hJRlQpCi0JCQkgICE9IFpfT0spKSB7Ci0JCXV0X2Vycm9yOwotCX0KLQogCWRfc3RyZWFtLm5l
eHRfaW4gPSBwYWdlX3ppcC0+ZGF0YSArIFBBR0VfREFUQTsKIAkvKiBTdWJ0cmFjdCB0aGUgc3Bh
Y2UgcmVzZXJ2ZWQgZm9yCiAJdGhlIHBhZ2UgaGVhZGVyIGFuZCB0aGUgZW5kIG1hcmtlciBvZiB0
aGUgbW9kaWZpY2F0aW9uIGxvZy4gKi8KIAlkX3N0cmVhbS5hdmFpbF9pbiA9IHBhZ2VfemlwX2dl
dF9zaXplKHBhZ2VfemlwKSAtIChQQUdFX0RBVEEgKyAxKTsKLQogCWRfc3RyZWFtLm5leHRfb3V0
ID0gcGFnZSArIFBBR0VfWklQX1NUQVJUOwogCWRfc3RyZWFtLmF2YWlsX291dCA9IFVOSVZfUEFH
RV9TSVpFIC0gUEFHRV9aSVBfU1RBUlQ7CiAKKwlpZiAoVU5JVl9VTkxJS0VMWShpbmZsYXRlSW5p
dDIoJmRfc3RyZWFtLCBVTklWX1BBR0VfU0laRV9TSElGVCkKKwkJCSAgIT0gWl9PSykpIHsKKwkJ
dXRfZXJyb3I7CisJfQorCiAJLyogRGVjb2RlIHRoZSB6bGliIGhlYWRlciBhbmQgdGhlIGluZGV4
IGluZm9ybWF0aW9uLiAqLwogCWlmIChVTklWX1VOTElLRUxZKGluZmxhdGUoJmRfc3RyZWFtLCBa
X0JMT0NLKSAhPSBaX09LKSkgewogCgo=

--===============0199179580==
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: 7ac42249be6da212f3d6a1d7d292c86fe7011536
# timestamp: 2011-03-15 12:01:24 +0200
# base_revision_id: vasil.dimov@stripped\
#   2ywlry42umdfhw5e
# 
# Begin bundle
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


--===============0199179580==--