From: marko.makela
Date: April 28 2011 7:34am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3611)
List-Archive: http://lists.mysql.com/commits/136266
Message-Id: <201104280734.p3S7YfGM032285@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1566364880=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyODA3Mjk0MC00NThn
NjRhdHhlN3g3d3E4CgogMzYxMSBNYXJrbyBNw6RrZWzDpAkyMDExLTA0LTI4CiAgICAgIFJlbW92
ZSBzb21lIGRlYnVnIGNvZGUgdGhhdCB3YXMgYWRkZWQgaW4gTXlTUUwgMy4yMy40NC4KICAgICAg
CiAgICAgIFVudGlsIE15U1FMIDMuMjMuNDQsIHRoZXJlIHdhcyBhbiBpbmNvcnJlY3Qgb3B0aW1p
emF0aW9uIGluIHRoZQogICAgICB0cmFuc2FjdGlvbiBjb21taXQuIFRoZSB1cGRhdGVfdW5kbyBs
b2cgd291bGQgYmUgZGlzY2FyZGVkIGF0IGNvbW1pdAogICAgICBpZiBpdCBjb21wcmlzZWQgb25s
eSBvbmUgcGFnZSwgaXQgZGlkIG5vdCBkZWxldGUtbWFyayBhbnl0aGluZywgYW5kCiAgICAgIHRo
ZXJlIHdhcyBvbmx5IG9uZSByZWFkIHZpZXcgaW4gdHJ4X3N5cy0+dmlld19saXN0LiAoSXQgbG9v
a3MgbGlrZQogICAgICB0aGF0IHRoZSByZWFkIHZpZXcgY291bGQgaGF2ZSBiZWxvbmdlZCB0byBh
IGRpZmZlcmVudCB0cmFuc2FjdGlvbiwgaWYKICAgICAgdGhlIGNvbW1pdHRpbmcgdHJhbnNhY3Rp
b24gdXNlZCBjb25zaXN0ZW50IHJlYWRzLikgRXZlciBzaW5jZSB0aGVuLAogICAgICB1cGRhdGVf
dW5kbyBsb2dzIGNhbiBvbmx5IGJlIGRpc2NhcmRlZCBieSB0aGUgcHVyZ2UuCiAgICAgIAogICAg
ICB0cnhfcHVyZ2Vfc3lzX3ByaW50KCk6IFJlbW92ZS4KICAgICAgCiAgICAgIHRyeF91bmRvX3By
ZXZfdmVyc2lvbl9idWlsZCgpOiBPbiBjb3JydXB0aW9uLCBuZXZlciBwcmludCBvdXQgYW55dGhp
bmcKICAgICAgYW5kIHJldHVybiBEQl9FUlJPUiwgYnV0IGxldCBhbiBhc3NlcnRpb24gZmFpbCBp
bnN0ZWFkLiBUaGVzZQogICAgICBwcmludG91dHMgaGF2ZSBhcHBhcmVudGx5IG5ldmVyIGJlZW4g
dHJpZ2dlcmVkIGluIHRoZSAxMCB5ZWFycyBvZgogICAgICB0aGVpciBleGlzdGVuY2UuIFRoZSBv
bmx5IHJlZmVyZW5jZXMgdG8gdGhlbSB3ZXJlIGZvdW5kIGluIGNvcnJ1cHRlZAogICAgICBkYXRh
YmFzZXMgb3Igd2hlbiBhdHRlbXB0aW5nIHRvIHJlc2N1ZSBhIGNvcnJ1cHRlZCBkYXRhYmFzZS4g
SW4gc3VjaAogICAgICBzaXR1YXRpb25zLCB0aGUgYXNzZXJ0aW9uIGZhaWx1cmVzIGNhbiBiZSBh
dm9pZGVkIGJ5IHNldHRpbmcKICAgICAgaW5ub2RiX2ZvcmNlX3JlY292ZXJ5PTUuCiAgICAgIAog
ICAgICByYjo2NTIgYXBwcm92ZWQgYnkgU3VubnkgQmFpbnMKCiAgICBtb2RpZmllZDoKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDBwdXJnZS5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS90cngwcmVjLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHB1cmdl
LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdHJ4MHB1cmdlLmgnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS90cngwcHVyZ2UuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDQyODA3Mjk0MC00NThnNjRhdHhlN3g3d3E4CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS90cngwcHVyZ2UuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyODA3
MzM0OS1oanZkbndsZGc5N2RsMzRhCkBAIC0xMDAsMTMgKzEwMCw2IEBAIHRyeF9wdXJnZSgKIAkJ
CQkJc3VibWl0IHRvIHRhc2sgcXVldWUuICovCiAJdWxpbnQJbGltaXQpOwkJCS8qITwgaW46IHRo
ZSBtYXhpbXVtIG51bWJlciBvZgogCQkJCQlyZWNvcmRzIHRvIHB1cmdlIGluIG9uZSBiYXRjaCAq
LwotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKi8vKioKLVByaW50cyBpbmZvcm1hdGlvbiBvZiB0aGUgcHVyZ2Ugc3lzdGVt
IHRvIHN0ZGVyci4gKi8KLVVOSVZfSU5URVJOCi12b2lkCi10cnhfcHVyZ2Vfc3lzX3ByaW50KHZv
aWQpOwotLyo9PT09PT09PT09PT09PT09PT09PT09Ki8KLQogLyoqIFRoaXMgaXMgdGhlIHB1cmdl
IHBvaW50ZXIvaXRlcmF0b3IuIFdlIG5lZWQgYm90aCB0aGUgdW5kbyBubyBhbmQgdGhlCiB0cmFu
c2FjdGlvbiBubyB1cCB0byB3aGljaCBwdXJnZSBoYXMgcGFyc2VkIGFuZCBhcHBsaWVkIHRoZSBy
ZWNvcmRzLiAqLwogdHlwZWRlZiBzdHJ1Y3QgcHVyZ2VfaXRlcl9zdHJ1Y3QgewoKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwcmVjLmgnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwcmVjLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMTA0MjgwNzI5NDAtNDU4ZzY0YXR4ZTd4N3dxOAorKysgYi9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvdHJ4MHJlYy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDI4
MDczMzQ5LWhqdmRud2xkZzk3ZGwzNGEKQEAgLTI0NSw4ICsyNDUsNyBAQCB0aGF0IHRoZSBjYWxs
ZXIgaGFzIGEgbGF0Y2ggb24gdGhlIGluZGV4CiBhbmQgYW4gcy1sYXRjaCBvbiB0aGUgcHVyZ2Vf
dmlldy4gVGhpcyBndWFyYW50ZWVzIHRoYXQgdGhlIHN0YWNrIG9mIHZlcnNpb25zCiBpcyBsb2Nr
ZWQuCiBAcmV0dXJuIERCX1NVQ0NFU1MsIG9yIERCX01JU1NJTkdfSElTVE9SWSBpZiB0aGUgcHJl
dmlvdXMgdmVyc2lvbiBpcwotZWFybGllciB0aGFuIHB1cmdlX3ZpZXcsIHdoaWNoIG1lYW5zIHRo
YXQgaXQgbWF5IGhhdmUgYmVlbiByZW1vdmVkLAotREJfRVJST1IgaWYgY29ycnVwdGVkIHJlY29y
ZCAqLworZWFybGllciB0aGFuIHB1cmdlX3ZpZXcsIHdoaWNoIG1lYW5zIHRoYXQgaXQgbWF5IGhh
dmUgYmVlbiByZW1vdmVkICovCiBVTklWX0lOVEVSTgogdWxpbnQKIHRyeF91bmRvX3ByZXZfdmVy
c2lvbl9idWlsZCgKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3RyeC90cngw
cHVyZ2UuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHB1cmdlLmMJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MjgwNzI5NDAtNDU4ZzY0YXR4ZTd4N3dxOAorKysg
Yi9zdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcHVyZ2UuYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDExMDQyODA3MzM0OS1oanZkbndsZGc5N2RsMzRhCkBAIC0xMzA5LDI4ICsxMzA5
LDMgQEAgcnVuX3N5bmNocm9ub3VzbHk6CiAKIAlyZXR1cm4obl9wYWdlc19oYW5kbGVkKTsKIH0K
LQotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKi8vKioKLVByaW50cyBpbmZvcm1hdGlvbiBvZiB0aGUgcHVyZ2Ugc3lzdGVt
IHRvIHN0ZGVyci4gKi8KLVVOSVZfSU5URVJOCi12b2lkCi10cnhfcHVyZ2Vfc3lzX3ByaW50KHZv
aWQpCi0vKj09PT09PT09PT09PT09PT09PT09PSovCi17Ci0JZnByaW50ZihzdGRlcnIsICJJbm5v
REI6IFB1cmdlIHN5c3RlbSB2aWV3OlxuIik7Ci0JcmVhZF92aWV3X3ByaW50KHB1cmdlX3N5cy0+
dmlldyk7Ci0KLQlmcHJpbnRmKHN0ZGVyciwgIklubm9EQjogUHVyZ2UgdHJ4IG46byAiIFRSWF9J
RF9GTVQKLQkJIiwgdW5kbyBuOm8gIiBUUlhfSURfRk1UICJcbiIsCi0JCSh1bGxpbnQpIHB1cmdl
X3N5cy0+bGltaXQudHJ4X25vLAotCQkodWxsaW50KSBwdXJnZV9zeXMtPmxpbWl0LnVuZG9fbm8p
OwotCWZwcmludGYoc3RkZXJyLAotCQkiSW5ub0RCOiBQdXJnZSBuZXh0IHN0b3JlZCAlbHUsIHBh
Z2Vfbm8gJWx1LCBvZmZzZXQgJWx1LFxuIgotCQkiSW5ub0RCOiBQdXJnZSBoZHJfcGFnZV9ubyAl
bHUsIGhkcl9vZmZzZXQgJWx1XG4iLAotCQkodWxvbmcpIHB1cmdlX3N5cy0+bmV4dF9zdG9yZWQs
Ci0JCSh1bG9uZykgcHVyZ2Vfc3lzLT5wYWdlX25vLAotCQkodWxvbmcpIHB1cmdlX3N5cy0+b2Zm
c2V0LAotCQkodWxvbmcpIHB1cmdlX3N5cy0+aGRyX3BhZ2Vfbm8sCi0JCSh1bG9uZykgcHVyZ2Vf
c3lzLT5oZHJfb2Zmc2V0KTsKLX0KLQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvdHJ4L3RyeDByZWMuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDI4MDcyOTQwLTQ1OGc2NGF0eGU3eDd3
cTgKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHJlYy5jCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTEwNDI4MDczMzQ5LWhqdmRud2xkZzk3ZGwzNGEKQEAgLTE0MDYsOCAr
MTQwNiw3IEBAIHRoYXQgdGhlIGNhbGxlciBoYXMgYSBsYXRjaCBvbiB0aGUgaW5kZXgKIGFuZCBh
biBzLWxhdGNoIG9uIHRoZSBwdXJnZV92aWV3LiBUaGlzIGd1YXJhbnRlZXMgdGhhdCB0aGUgc3Rh
Y2sgb2YgdmVyc2lvbnMKIGlzIGxvY2tlZCBhbGwgdGhlIHdheSBkb3duIHRvIHRoZSBwdXJnZV92
aWV3LgogQHJldHVybiBEQl9TVUNDRVNTLCBvciBEQl9NSVNTSU5HX0hJU1RPUlkgaWYgdGhlIHBy
ZXZpb3VzIHZlcnNpb24gaXMKLWVhcmxpZXIgdGhhbiBwdXJnZV92aWV3LCB3aGljaCBtZWFucyB0
aGF0IGl0IG1heSBoYXZlIGJlZW4gcmVtb3ZlZCwKLURCX0VSUk9SIGlmIGNvcnJ1cHRlZCByZWNv
cmQgKi8KK2VhcmxpZXIgdGhhbiBwdXJnZV92aWV3LCB3aGljaCBtZWFucyB0aGF0IGl0IG1heSBo
YXZlIGJlZW4gcmVtb3ZlZCAqLwogVU5JVl9JTlRFUk4KIHVsaW50CiB0cnhfdW5kb19wcmV2X3Zl
cnNpb25fYnVpbGQoCkBAIC0xNDUxLDIwICsxNDUwLDcgQEAgdHJ4X3VuZG9fcHJldl92ZXJzaW9u
X2J1aWxkKAogCSAgICAgIHx8IG10cl9tZW1vX2NvbnRhaW5zX3BhZ2UoaW5kZXhfbXRyLCBpbmRl
eF9yZWMsCiAJCQkJCU1UUl9NRU1PX1BBR0VfWF9GSVgpKTsKIAl1dF9hZChyZWNfb2Zmc192YWxp
ZGF0ZShyZWMsIGluZGV4LCBvZmZzZXRzKSk7Ci0KLQlpZiAoIWRpY3RfaW5kZXhfaXNfY2x1c3Qo
aW5kZXgpKSB7Ci0JCWZwcmludGYoc3RkZXJyLCAiSW5ub0RCOiBFcnJvcjogdHJ5aW5nIHRvIGFj
Y2VzcyIKLQkJCSIgdXBkYXRlIHVuZG8gcmVjIGZvciBub24tY2x1c3RlcmVkIGluZGV4ICVzXG4i
Ci0JCQkiSW5ub0RCOiBTdWJtaXQgYSBkZXRhaWxlZCBidWcgcmVwb3J0IHRvIgotCQkJIiBodHRw
Oi8vYnVncy5teXNxbC5jb21cbiIKLQkJCSJJbm5vREI6IGluZGV4IHJlY29yZCAiLCBpbmRleC0+
bmFtZSk7Ci0JCXJlY19wcmludChzdGRlcnIsIGluZGV4X3JlYywgaW5kZXgpOwotCQlmcHV0cygi
XG4iCi0JCSAgICAgICJJbm5vREI6IHJlY29yZCB2ZXJzaW9uICIsIHN0ZGVycik7Ci0JCXJlY19w
cmludF9uZXcoc3RkZXJyLCByZWMsIG9mZnNldHMpOwotCQlwdXRjKCdcbicsIHN0ZGVycik7Ci0J
CXJldHVybihEQl9FUlJPUik7Ci0JfQorCXV0X2EoZGljdF9pbmRleF9pc19jbHVzdChpbmRleCkp
OwogCiAJcm9sbF9wdHIgPSByb3dfZ2V0X3JlY19yb2xsX3B0cihyZWMsIGluZGV4LCBvZmZzZXRz
KTsKIAlvbGRfcm9sbF9wdHIgPSByb2xsX3B0cjsKQEAgLTE0ODQsNyArMTQ3MCw5IEBAIHRyeF91
bmRvX3ByZXZfdmVyc2lvbl9idWlsZCgKIAogCWlmIChVTklWX1VOTElLRUxZKGVyciAhPSBEQl9T
VUNDRVNTKSkgewogCQkvKiBUaGUgdW5kbyByZWNvcmQgbWF5IGFscmVhZHkgaGF2ZSBiZWVuIHB1
cmdlZC4KLQkJVGhpcyBzaG91bGQgbmV2ZXIgaGFwcGVuIGluIElubm9EQi4gKi8KKwkJVGhpcyBz
aG91bGQgbmV2ZXIgaGFwcGVuIGZvciB1c2VyIHRyYW5zYWN0aW9ucywgYnV0CisJCWl0IGNhbiBo
YXBwZW4gaW4gcHVyZ2UuICovCisJCXV0X2FkKGVyciA9PSBEQl9NSVNTSU5HX0hJU1RPUlkpOwog
CiAJCXJldHVybihlcnIpOwogCX0KQEAgLTE1MjIsNTQgKzE1MTAsOCBAQCB0cnhfdW5kb19wcmV2
X3ZlcnNpb25fYnVpbGQoCiAJcHRyID0gdHJ4X3VuZG9fdXBkYXRlX3JlY19nZXRfdXBkYXRlKHB0
ciwgaW5kZXgsIHR5cGUsIHRyeF9pZCwKIAkJCQkJICAgICByb2xsX3B0ciwgaW5mb19iaXRzLAog
CQkJCQkgICAgIE5VTEwsIGhlYXAsICZ1cGRhdGUpOwotCi0JaWYgKFVOSVZfVU5MSUtFTFkodGFi
bGVfaWQgIT0gaW5kZXgtPnRhYmxlLT5pZCkpIHsKLQkJcHRyID0gTlVMTDsKLQotCQlmcHJpbnRm
KHN0ZGVyciwKLQkJCSJJbm5vREI6IEVycm9yOiB0cnlpbmcgdG8gYWNjZXNzIHVwZGF0ZSB1bmRv
IHJlYyIKLQkJCSIgZm9yIHRhYmxlICVzXG4iCi0JCQkiSW5ub0RCOiBidXQgdGhlIHRhYmxlIGlk
IGluIHRoZSIKLQkJCSIgdW5kbyByZWNvcmQgaXMgd3JvbmdcbiIKLQkJCSJJbm5vREI6IFN1Ym1p
dCBhIGRldGFpbGVkIGJ1ZyByZXBvcnQiCi0JCQkiIHRvIGh0dHA6Ly9idWdzLm15c3FsLmNvbVxu
IgotCQkJIklubm9EQjogUnVuIGFsc28gQ0hFQ0sgVEFCTEUgJXNcbiIsCi0JCQlpbmRleC0+dGFi
bGVfbmFtZSwgaW5kZXgtPnRhYmxlX25hbWUpOwotCX0KLQotCWlmIChwdHIgPT0gTlVMTCkgewot
CQkvKiBUaGUgcmVjb3JkIHdhcyBjb3JydXB0ZWQsIHJldHVybiBhbiBlcnJvcjsgdGhlc2UgcHJp
bnRmcwotCQlzaG91bGQgY2F0Y2ggYW4gZWx1c2l2ZSBidWcgaW4gcm93X3ZlcnNfb2xkX2hhc19p
bmRleF9lbnRyeSAqLwotCi0JCWZwcmludGYoc3RkZXJyLAotCQkJIklubm9EQjogdGFibGUgJXMs
IGluZGV4ICVzLCBuX3VuaXEgJWx1XG4iCi0JCQkiSW5ub0RCOiB1bmRvIHJlYyBhZGRyZXNzICVw
LCB0eXBlICVsdSBjbXBsX2luZm8gJWx1XG4iCi0JCQkiSW5ub0RCOiB1bmRvIHJlYyB0YWJsZSBp
ZCAlbGx1LCIKLQkJCSIgaW5kZXggdGFibGUgaWQgJWxsdVxuIgotCQkJIklubm9EQjogZHVtcCBv
ZiAxNTAgYnl0ZXMgaW4gdW5kbyByZWM6ICIsCi0JCQlpbmRleC0+dGFibGVfbmFtZSwgaW5kZXgt
Pm5hbWUsCi0JCQkodWxvbmcpIGRpY3RfaW5kZXhfZ2V0X25fdW5pcXVlKGluZGV4KSwKLQkJCXVu
ZG9fcmVjLCAodWxvbmcpIHR5cGUsICh1bG9uZykgY21wbF9pbmZvLAotCQkJKHVsbGludCkgdGFi
bGVfaWQsCi0JCQkodWxsaW50KSBpbmRleC0+dGFibGUtPmlkKTsKLQkJdXRfcHJpbnRfYnVmKHN0
ZGVyciwgdW5kb19yZWMsIDE1MCk7Ci0JCWZwdXRzKCJcbiIKLQkJICAgICAgIklubm9EQjogaW5k
ZXggcmVjb3JkICIsIHN0ZGVycik7Ci0JCXJlY19wcmludChzdGRlcnIsIGluZGV4X3JlYywgaW5k
ZXgpOwotCQlmcHV0cygiXG4iCi0JCSAgICAgICJJbm5vREI6IHJlY29yZCB2ZXJzaW9uICIsIHN0
ZGVycik7Ci0JCXJlY19wcmludF9uZXcoc3RkZXJyLCByZWMsIG9mZnNldHMpOwotCQlmcHJpbnRm
KHN0ZGVyciwgIlxuIgotCQkJIklubm9EQjogUmVjb3JkIHRyeCBpZCAiIFRSWF9JRF9GTVQKLQkJ
CSIsIHVwZGF0ZSByZWMgdHJ4IGlkICIgVFJYX0lEX0ZNVCAiXG4iCi0JCQkiSW5ub0RCOiBSb2xs
IHB0ciBpbiByZWMgIiBUUlhfSURfRk1UCi0JCQkiLCBpbiB1cGRhdGUgcmVjIiBUUlhfSURfRk1U
ICJcbiIsCi0JCQkodWxsaW50KSByZWNfdHJ4X2lkLCAodWxsaW50KSB0cnhfaWQsCi0JCQkodWxs
aW50KSBvbGRfcm9sbF9wdHIsICh1bGxpbnQpIHJvbGxfcHRyKTsKLQotCQl0cnhfcHVyZ2Vfc3lz
X3ByaW50KCk7Ci0JCXJldHVybihEQl9FUlJPUik7Ci0JfQorCXV0X2EodGFibGVfaWQgPT0gaW5k
ZXgtPnRhYmxlLT5pZCk7CisJdXRfYShwdHIpOwogCiAJaWYgKHJvd191cGRfY2hhbmdlc19maWVs
ZF9zaXplX29yX2V4dGVybmFsKGluZGV4LCBvZmZzZXRzLCB1cGRhdGUpKSB7CiAJCXVsaW50CW5f
ZXh0OwoK

--===============1566364880==
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.6-innodb/
# testament_sha1: a0b943617a422ab69330e9ba7c2b836deb311933
# timestamp: 2011-04-28 10:34:32 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   458g64atxe7x7wq8
# 
# Begin bundle
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


--===============1566364880==--