From: marko.makela
Date: February 15 2011 11:23am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3501 to 3502) Bug#60049
List-Archive: http://lists.mysql.com/commits/131301
X-Bug: 60049
Message-Id: <201102151123.p1F9nH3o005656@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1171792621=="

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

IDM1MDIgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xNQogICAgICBCdWcjNjAwNDkgQ2xhcmlmeSB0
aGUgY29tbWVudHMgaW4gcm93X2luc19tdXN0X21vZGlmeSgpCiAgICAgIAogICAgICByb3dfaW5z
X211c3RfbW9kaWZ5X3JlYygpOiBSZW5hbWVkIGZyb20gcm93X2luc19tdXN0X21vZGlmeSgpLgog
ICAgICBDaGFuZ2UgdGhlIHJldHVybiB0eXBlIHRvIGlib29sLiBNYWtlIHRoZSBwYXJhbWV0ZXIg
Y29uc3QuCiAgICAgIENsYXJpZnkgd2h5IHdlIG9ubHkgYWxsb3cgdXBkYXRpbmcgdGhlIHByZXZp
b3VzIHJlY29yZCBpbiBwbGFjZS4KICAgICAgCiAgICAgIFJPV19JTlNfUFJFViwgUk9XX0lOU19O
RVhUOiBSZW1vdmUuIFRoZXNlIHdlcmUgdGhlIG5vbnplcm8gcmV0dXJuCiAgICAgIHZhbHVlcyBv
ZiByb3dfaW5zX211c3RfbW9kaWZ5KCkuIFJPV19JTlNfTkVYVCB3YXMgbmV2ZXIgcmV0dXJuZWQu
CiAgICAgIAogICAgICByb3dfaW5zX2luZGV4X2VudHJ5X2xvdygpOiBDaGFuZ2UgdGhlIHR5cGUg
b2YgIm1vZGlmeSIgdG8gaWJvb2wuCiAgICAgIFJlbW92ZSB0aGUgaGFuZGxpbmcgZm9yIFJPV19J
TlNfTkVYVCwgd2hpY2ggd2FzIG5ldmVyIHJldHVybmVkLgogICAgICAKICAgICAgYnRyX2N1cl9n
ZXRfYmxvY2soKSwgYnRyX2N1cl9nZXRfcmVjKCk6IERlZmluZSBhcyBjb25zdG5lc3MtcHJlc2Vy
dmluZwogICAgICBtYWNyb3MuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9idHIwY3VyLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0cjBjdXIu
aWMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGlucy5jCiAzNTAxIE1hcmtvIE3DpGtl
bMOkCTIwMTEtMDItMTUgW21lcmdlXQogICAgICBNZXJnZSBteXNxbC01LjUtaW5ub2RiIHRvIG15
c3FsLXRydW5rLWlubm9kYi4KCiAgICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGIvci9pbm5vZGJfYnVnNjAwNDkucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3QvaW5ub2RiX2J1ZzYwMDQ5LW1hc3Rlci5vcHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGIvdC9pbm5vZGJfYnVnNjAwNDkudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL2J0cjBjdXIuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0
cjBjdXIuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNTEwMjA0NS0ybnFm
ZzFudW91YndjdWxiCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idHIwY3VyLmgJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMTUxMDQyNTMtcmswbnF6ZG8wbTZmN2Ji
MQpAQCAtNTQsOSArNTQsNiBAQCBwYWdlX2N1cl90KgogYnRyX2N1cl9nZXRfcGFnZV9jdXIoCiAv
Kj09PT09PT09PT09PT09PT09Ki8KIAljb25zdCBidHJfY3VyX3QqCWN1cnNvcik7LyohPCBpbjog
dHJlZSBjdXJzb3IgKi8KLSNlbHNlIC8qIFVOSVZfREVCVUcgKi8KLSMgZGVmaW5lIGJ0cl9jdXJf
Z2V0X3BhZ2VfY3VyKGN1cnNvcikgKCYoY3Vyc29yKS0+cGFnZV9jdXIpCi0jZW5kaWYgLyogVU5J
Vl9ERUJVRyAqLwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKi8vKioKIFJldHVybnMgdGhlIGJ1ZmZlciBibG9jayBvbiB3aGljaCB0aGUg
dHJlZSBjdXJzb3IgaXMgcG9zaXRpb25lZC4KIEByZXR1cm4JcG9pbnRlciB0byBidWZmZXIgYmxv
Y2sgKi8KQEAgLTY0LDcgKzYxLDcgQEAgVU5JVl9JTkxJTkUKIGJ1Zl9ibG9ja190KgogYnRyX2N1
cl9nZXRfYmxvY2soCiAvKj09PT09PT09PT09PT09Ki8KLQlidHJfY3VyX3QqCWN1cnNvcik7Lyoh
PCBpbjogdHJlZSBjdXJzb3IgKi8KKwljb25zdCBidHJfY3VyX3QqCWN1cnNvcik7LyohPCBpbjog
dHJlZSBjdXJzb3IgKi8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKiovLyoqCiBSZXR1cm5zIHRoZSByZWNvcmQgcG9pbnRlciBvZiBhIHRy
ZWUgY3Vyc29yLgogQHJldHVybglwb2ludGVyIHRvIHJlY29yZCAqLwpAQCAtNzIsNyArNjksMTIg
QEAgVU5JVl9JTkxJTkUKIHJlY190KgogYnRyX2N1cl9nZXRfcmVjKAogLyo9PT09PT09PT09PT0q
LwotCWJ0cl9jdXJfdCoJY3Vyc29yKTsvKiE8IGluOiB0cmVlIGN1cnNvciAqLworCWNvbnN0IGJ0
cl9jdXJfdCoJY3Vyc29yKTsvKiE8IGluOiB0cmVlIGN1cnNvciAqLworI2Vsc2UgLyogVU5JVl9E
RUJVRyAqLworIyBkZWZpbmUgYnRyX2N1cl9nZXRfcGFnZV9jdXIoY3Vyc29yKQkoJihjdXJzb3Ip
LT5wYWdlX2N1cikKKyMgZGVmaW5lIGJ0cl9jdXJfZ2V0X2Jsb2NrKGN1cnNvcikJKChjdXJzb3Ip
LT5wYWdlX2N1ci5ibG9jaykKKyMgZGVmaW5lIGJ0cl9jdXJfZ2V0X3JlYyhjdXJzb3IpCSgoY3Vy
c29yKS0+cGFnZV9jdXIucmVjKQorI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KIC8qKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZXR1
cm5zIHRoZSBjb21wcmVzc2VkIHBhZ2Ugb24gd2hpY2ggdGhlIHRyZWUgY3Vyc29yIGlzIHBvc2l0
aW9uZWQuCiBAcmV0dXJuCXBvaW50ZXIgdG8gY29tcHJlc3NlZCBwYWdlLCBvciBOVUxMIGlmIHRo
ZSBwYWdlIGlzIG5vdCBjb21wcmVzc2VkICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL2J0cjBjdXIuaWMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9idHIwY3VyLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjE1MTAyMDQ1
LTJucWZnMW51b3Vid2N1bGIKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0cjBjdXIu
aWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMTUxMDQyNTMtcmswbnF6ZG8w
bTZmN2JiMQpAQCAtMzgsNyArMzgsNyBAQCBidHJfY3VyX2dldF9wYWdlX2N1cigKIHsKIAlyZXR1
cm4oJigoYnRyX2N1cl90KikgY3Vyc29yKS0+cGFnZV9jdXIpOwogfQotI2VuZGlmIC8qIFVOSVZf
REVCVUcgKi8KKwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKi8vKioKIFJldHVybnMgdGhlIGJ1ZmZlciBibG9jayBvbiB3aGljaCB0aGUg
dHJlZSBjdXJzb3IgaXMgcG9zaXRpb25lZC4KIEByZXR1cm4JcG9pbnRlciB0byBidWZmZXIgYmxv
Y2sgKi8KQEAgLTQ2LDcgKzQ2LDcgQEAgVU5JVl9JTkxJTkUKIGJ1Zl9ibG9ja190KgogYnRyX2N1
cl9nZXRfYmxvY2soCiAvKj09PT09PT09PT09PT09Ki8KLQlidHJfY3VyX3QqCWN1cnNvcikJLyoh
PCBpbjogdHJlZSBjdXJzb3IgKi8KKwljb25zdCBidHJfY3VyX3QqCWN1cnNvcikJLyohPCBpbjog
dHJlZSBjdXJzb3IgKi8KIHsKIAlyZXR1cm4ocGFnZV9jdXJfZ2V0X2Jsb2NrKGJ0cl9jdXJfZ2V0
X3BhZ2VfY3VyKGN1cnNvcikpKTsKIH0KQEAgLTU4LDEwICs1OCwxMSBAQCBVTklWX0lOTElORQog
cmVjX3QqCiBidHJfY3VyX2dldF9yZWMoCiAvKj09PT09PT09PT09PSovCi0JYnRyX2N1cl90Kglj
dXJzb3IpCS8qITwgaW46IHRyZWUgY3Vyc29yICovCisJY29uc3QgYnRyX2N1cl90KgljdXJzb3Ip
CS8qITwgaW46IHRyZWUgY3Vyc29yICovCiB7Ci0JcmV0dXJuKHBhZ2VfY3VyX2dldF9yZWMoJihj
dXJzb3ItPnBhZ2VfY3VyKSkpOworCXJldHVybihwYWdlX2N1cl9nZXRfcmVjKGJ0cl9jdXJfZ2V0
X3BhZ2VfY3VyKGN1cnNvcikpKTsKIH0KKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCiAKIC8qKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoq
CiBSZXR1cm5zIHRoZSBjb21wcmVzc2VkIHBhZ2Ugb24gd2hpY2ggdGhlIHRyZWUgY3Vyc29yIGlz
IHBvc2l0aW9uZWQuCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MGlucy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmMJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMTUxMDIwNDUtMm5xZmcxbnVvdWJ3Y3VsYgorKysgYi9z
dG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMTAyMTUxMDQyNTMtcmswbnF6ZG8wbTZmN2JiMQpAQCAtNDgsOSArNDgsNiBAQCBDcmVh
dGVkIDQvMjAvMTk5NiBIZWlra2kgVHV1cmkKICNpbmNsdWRlICJ1c3Iwc2Vzcy5oIgogI2luY2x1
ZGUgImJ1ZjBscnUuaCIKIAotI2RlZmluZQlST1dfSU5TX1BSRVYJMQotI2RlZmluZQlST1dfSU5T
X05FWFQJMgotCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKgogSU1QT1JUQU5UIE5PVEU6IEFueSBvcGVyYXRp
b24gdGhhdCBnZW5lcmF0ZXMgcmVkbyBNVVNUIGNoZWNrIHRoYXQgdGhlcmUKIGlzIGVub3VnaCBz
cGFjZSBpbiB0aGUgcmVkbyBsb2cgYmVmb3JlIGZvciB0aGF0IG9wZXJhdGlvbi4gVGhpcyBpcwpA
QCAtMTkzMCwyMyArMTkyNywyMiBAQCBmdW5jX2V4aXQ6CiB9CiAKIC8qKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1DaGVj
a3MgaWYgYW4gaW5kZXggZW50cnkgaGFzIGxvbmcgZW5vdWdoIGNvbW1vbiBwcmVmaXggd2l0aCBh
biBleGlzdGluZwotcmVjb3JkIHNvIHRoYXQgdGhlIGludGVuZGVkIGluc2VydCBvZiB0aGUgZW50
cnkgbXVzdCBiZSBjaGFuZ2VkIHRvIGEgbW9kaWZ5IG9mCi10aGUgZXhpc3RpbmcgcmVjb3JkLiBJ
biB0aGUgY2FzZSBvZiBhIGNsdXN0ZXJlZCBpbmRleCwgdGhlIHByZWZpeCBtdXN0IGJlCi1uX3Vu
aXF1ZSBmaWVsZHMgbG9uZywgYW5kIGluIHRoZSBjYXNlIG9mIGEgc2Vjb25kYXJ5IGluZGV4LCBh
bGwgZmllbGRzIG11c3QgYmUKLWVxdWFsLgotQHJldHVybiAwIGlmIG5vIHVwZGF0ZSwgUk9XX0lO
U19QUkVWIGlmIHByZXZpb3VzIHNob3VsZCBiZSB1cGRhdGVkOwotY3VycmVudGx5IHdlIGRvIHRo
ZSBzZWFyY2ggc28gdGhhdCBvbmx5IHRoZSBsb3dfbWF0Y2ggcmVjb3JkIGNhbiBtYXRjaAotZW5v
dWdoIHRvIHRoZSBzZWFyY2ggdHVwbGUsIG5vdCB0aGUgbmV4dCByZWNvcmQgKi8KK0NoZWNrcyBp
ZiBhbiBpbmRleCBlbnRyeSBoYXMgbG9uZyBlbm91Z2ggY29tbW9uIHByZWZpeCB3aXRoIGFuCitl
eGlzdGluZyByZWNvcmQgc28gdGhhdCB0aGUgaW50ZW5kZWQgaW5zZXJ0IG9mIHRoZSBlbnRyeSBt
dXN0IGJlCitjaGFuZ2VkIHRvIGEgbW9kaWZ5IG9mIHRoZSBleGlzdGluZyByZWNvcmQuIEluIHRo
ZSBjYXNlIG9mIGEgY2x1c3RlcmVkCitpbmRleCwgdGhlIHByZWZpeCBtdXN0IGJlIG5fdW5pcXVl
IGZpZWxkcyBsb25nLiBJbiB0aGUgY2FzZSBvZiBhCitzZWNvbmRhcnkgaW5kZXgsIGFsbCBmaWVs
ZHMgbXVzdCBiZSBlcXVhbC4gIElubm9EQiBuZXZlciB1cGRhdGVzCitzZWNvbmRhcnkgaW5kZXgg
cmVjb3JkcyBpbiBwbGFjZSwgb3RoZXIgdGhhbiBjbGVhcmluZyBvciBzZXR0aW5nIHRoZQorZGVs
ZXRlLW1hcmsgZmxhZy4gV2UgY291bGQgYmUgYWJsZSB0byB1cGRhdGUgdGhlIG5vbi11bmlxdWUg
ZmllbGRzCitvZiBhIHVuaXF1ZSBzZWNvbmRhcnkgaW5kZXggcmVjb3JkIGJ5IGNoZWNraW5nIHRo
ZSBjdXJzb3ItPnVwX21hdGNoLAorYnV0IHdlIGRvIG5vdCBkbyBzbywgYmVjYXVzZSBpdCBjb3Vs
ZCBoYXZlIHNvbWUgbG9ja2luZyBpbXBsaWNhdGlvbnMuCitAcmV0dXJuIFRSVUUgaWYgdGhlIGV4
aXN0aW5nIHJlY29yZCBzaG91bGQgYmUgdXBkYXRlZDsgRkFMU0UgaWYgbm90ICovCiBVTklWX0lO
TElORQotdWxpbnQKLXJvd19pbnNfbXVzdF9tb2RpZnkoCi0vKj09PT09PT09PT09PT09PT0qLwot
CWJ0cl9jdXJfdCoJY3Vyc29yKQkvKiE8IGluOiBCLXRyZWUgY3Vyc29yICovCitpYm9vbAorcm93
X2luc19tdXN0X21vZGlmeV9yZWMoCisvKj09PT09PT09PT09PT09PT09PT09Ki8KKwljb25zdCBi
dHJfY3VyX3QqCWN1cnNvcikJLyohPCBpbjogQi10cmVlIGN1cnNvciAqLwogewotCXVsaW50CWVu
b3VnaF9tYXRjaDsKLQlyZWNfdCoJcmVjOwotCiAJLyogTk9URTogKGNvbXBhcmUgdG8gdGhlIG5v
dGUgaW4gcm93X2luc19kdXBsaWNhdGVfZXJyb3IpIEJlY2F1c2Ugbm9kZQogCXBvaW50ZXJzIG9u
IHVwcGVyIGxldmVscyBvZiB0aGUgQi10cmVlIG1heSBtYXRjaCBtb3JlIHRvIGVudHJ5IHRoYW4K
IAl0byBhY3R1YWwgdXNlciByZWNvcmRzIG9uIHRoZSBsZWFmIGxldmVsLCB3ZSBoYXZlIHRvIGNo
ZWNrIGlmIHRoZQpAQCAtMTk1NCwxOSArMTk1MCw5IEBAIHJvd19pbnNfbXVzdF9tb2RpZnkoCiAJ
bm9kZSBwb2ludGVycyBjb250YWluIGluZGV4LT5uX3VuaXF1ZSBmaXJzdCBmaWVsZHMsIGFuZCBp
biB0aGUgY2FzZQogCW9mIGEgc2Vjb25kYXJ5IGluZGV4LCBhbGwgZmllbGRzIG9mIHRoZSBpbmRl
eC4gKi8KIAotCWVub3VnaF9tYXRjaCA9IGRpY3RfaW5kZXhfZ2V0X25fdW5pcXVlX2luX3RyZWUo
Y3Vyc29yLT5pbmRleCk7Ci0KLQlpZiAoY3Vyc29yLT5sb3dfbWF0Y2ggPj0gZW5vdWdoX21hdGNo
KSB7Ci0KLQkJcmVjID0gYnRyX2N1cl9nZXRfcmVjKGN1cnNvcik7Ci0KLQkJaWYgKCFwYWdlX3Jl
Y19pc19pbmZpbXVtKHJlYykpIHsKLQotCQkJcmV0dXJuKFJPV19JTlNfUFJFVik7Ci0JCX0KLQl9
Ci0KLQlyZXR1cm4oMCk7CisJcmV0dXJuKGN1cnNvci0+bG93X21hdGNoCisJICAgICAgID49IGRp
Y3RfaW5kZXhfZ2V0X25fdW5pcXVlX2luX3RyZWUoY3Vyc29yLT5pbmRleCkKKwkgICAgICAgJiYg
IXBhZ2VfcmVjX2lzX2luZmltdW0oYnRyX2N1cl9nZXRfcmVjKGN1cnNvcikpKTsKIH0KIAogLyoq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKi8vKioKQEAgLTE5OTQsOSArMTk4MCw4IEBAIHJvd19pbnNfaW5kZXhfZW50cnlfbG93KAog
ewogCWJ0cl9jdXJfdAljdXJzb3I7CiAJdWxpbnQJCXNlYXJjaF9tb2RlOwotCXVsaW50CQltb2Rp
ZnkgPSAwOyAvKiByZW1vdmUgd2FybmluZyAqLworCWlib29sCQltb2RpZnkJCQk9IEZBTFNFOwog
CXJlY190KgkJaW5zZXJ0X3JlYzsKLQlyZWNfdCoJCXJlYzsKIAl1bGludAkJZXJyOwogCXVsaW50
CQluX3VuaXF1ZTsKIAliaWdfcmVjX3QqCWJpZ19yZWMJCQk9IE5VTEw7CkBAIC0yMDg3LDIwICsy
MDcyLDEzIEBAIHJvd19pbnNfaW5kZXhfZW50cnlfbG93KAogCQl9CiAJfQogCi0JbW9kaWZ5ID0g
cm93X2luc19tdXN0X21vZGlmeSgmY3Vyc29yKTsKKwltb2RpZnkgPSByb3dfaW5zX211c3RfbW9k
aWZ5X3JlYygmY3Vyc29yKTsKIAotCWlmIChtb2RpZnkgIT0gMCkgeworCWlmIChtb2RpZnkpIHsK
IAkJLyogVGhlcmUgaXMgYWxyZWFkeSBhbiBpbmRleCBlbnRyeSB3aXRoIGEgbG9uZyBlbm91Z2gg
Y29tbW9uCiAJCXByZWZpeCwgd2UgbXVzdCBjb252ZXJ0IHRoZSBpbnNlcnQgaW50byBhIG1vZGlm
eSBvZiBhbgogCQlleGlzdGluZyByZWNvcmQgKi8KIAotCQlpZiAobW9kaWZ5ID09IFJPV19JTlNf
TkVYVCkgewotCQkJcmVjID0gcGFnZV9yZWNfZ2V0X25leHQoYnRyX2N1cl9nZXRfcmVjKCZjdXJz
b3IpKTsKLQotCQkJYnRyX2N1cl9wb3NpdGlvbihpbmRleCwgcmVjLAotCQkJCQkgYnRyX2N1cl9n
ZXRfYmxvY2soJmN1cnNvciksJmN1cnNvcik7Ci0JCX0KLQogCQlpZiAoZGljdF9pbmRleF9pc19j
bHVzdChpbmRleCkpIHsKIAkJCWVyciA9IHJvd19pbnNfY2x1c3RfaW5kZXhfZW50cnlfYnlfbW9k
aWZ5KAogCQkJCW1vZGUsICZjdXJzb3IsICZoZWFwLCAmYmlnX3JlYywgZW50cnksCgo=

--===============1171792621==
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: a43ea5f117b2aa3855842a18c043293f5cf45186
# timestamp: 2011-02-15 13:23:13 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   2nqfg1nuoubwculb
# 
# Begin bundle
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


--===============1171792621==--