From: marko.makela
Date: November 30 2010 2:09pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3243) Bug#58212
List-Archive: http://lists.mysql.com/commits/125506
X-Bug: 58212
Message-Id: <201011301409.oAUAjn8S009117@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0057402370=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpzdW5ueS5iYWluc0BvcmFjbGUuY29tLTIwMTAxMTMwMDU1MTQwLTUyanp6
cDA2dnBwNDlueTIKCiAzMjQzIE1hcmtvIE3DpGtlbMOkCTIwMTAtMTEtMzAKICAgICAgQnVnIzU4
MjEyIFBvc3NpYmxlIGRlYWRsb2NrIGluIGNoYW5nZSBidWZmZXIgaW4gZGVidWcgYnVpbGRzCiAg
ICAgIAogICAgICBpYnVmX3BhZ2UoKTogUmVuYW1lZCB0byBpYnVmX3BhZ2VfbG93KCkuIEFkZCB0
aGUgcGFyYW1ldGVycyBmaWxlLCBsaW5lCiAgICAgIHNvIHRoYXQgdGhlIGxhdGNoIGRpYWdub3N0
aWNzIHdpbGwgYmUgbW9yZSBtZWFuaW5nZnVsLgogICAgICBJbiBkZWJ1ZyBidWlsZHMsIGFkZCB0
aGUgcGFyYW1ldGVyIGlib29sIHhfbGF0Y2guIFdoZW4geF9sYXRjaD1GQUxTRSwKICAgICAgZG8g
bm90IHgtbGF0Y2ggdGhlIHBhZ2UsIGJ1dCBvbmx5IGJ1ZmZlci1maXggaXQgZm9yIHJlYWRpbmcg
dGhlIGJpdC4KICAgICAgSW4gVU5JVl9TWU5DX0RFQlVHLCBkaXNwbGF5IGEgbWVzc2FnZSBpZiBh
biBpbnNlcnQgYnVmZmVyIGJpdG1hcCBwYWdlCiAgICAgIHdhcyBhbHJlYWR5IGxhdGNoZWQuIChU
aGUgbWVzc2FnZSBzaG91bGQgYmUgZGlzcGxheWVkIGluIHRob3NlIGNhc2VzCiAgICAgIHdoZXJl
IHRoZSBjb2RlIHdvdWxkIGhhdmUgcHJldmlvdXNseSBmYWlsZWQuKQogICAgICAKICAgICAgaWJ1
Zl9wYWdlKCk6IEEgd3JhcHBlciBtYWNybyBmb3IgaWJ1Zl9wYWdlX2xvdygpLiBQYXNzIHhfbGF0
Y2g9VFJVRS4KICAgICAgCiAgICAgIGlidWZfYml0bWFwX3BhZ2VfZ2V0X2JpdHMoKTogUmVuYW1l
ZCB0byBpYnVmX2JpdG1hcF9wYWdlX2dldF9iaXRzX2xvdygpLgogICAgICBJbiBVTklWX0RFQlVH
LCBhZGQgdGhlIHBhcmFtZXRlciBsYXRjaF9tb2RlLgogICAgICBSZW1vdmUgdGhlIHBhcmFtZXRl
ciBtdHIgdW5sZXNzIFVOSVZfREVCVUcgaXMgZGVmaW5lZC4KICAgICAgCiAgICAgIGlidWZfYml0
bWFwX3BhZ2VfZ2V0X2JpdHMoKTogQSB3cmFwcGVyIG1hY3JvIGZvcgogICAgICBpYnVmX2JpdG1h
cF9wYWdlX2dldF9iaXRzX2xvdygpLiBQYXNzIGxhdGNoX3R5cGU9TVRSX01FTU9fUEFHRV9YX0ZJ
WC4KICAgICAgCiAgICAgIGJ1Zl9wYWdlX2dldF9nZW4oKTogVXNlIGlidWZfcGFnZV9sb3coeF9s
YXRjaD1GQUxTRSkgaW4gdGhlIGRlYnVnIGFzc2VydGlvbi4KICAgICAgVGhpcyBhdm9pZHMgdGhl
IHBvc3NpYmxlIGRlYWRsb2NrLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl
L2J1Zi9idWYwYnVmLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9pYnVmMGlidWYuaAo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L2J1Zi9idWYwYnVmLmMJcmV2aWQ6c3VubnkuYmFpbnNAb3JhY2xlLmNvbS0yMDEwMTEzMDA1NTE0
MC01Mmp6enAwNnZwcDQ5bnkyCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEzMDE0MDkxMC1vM215emc3NGZ5ODVo
anpjCkBAIC0yNzQ1LDcgKzI3NDUsOCBAQCBidWZfcGFnZV9nZXRfZ2VuKAogCXV0X2FkKHppcF9z
aXplID09IGZpbF9zcGFjZV9nZXRfemlwX3NpemUoc3BhY2UpKTsKIAl1dF9hZCh1dF9pc18ycG93
KHppcF9zaXplKSk7CiAjaWZuZGVmIFVOSVZfTE9HX0RFQlVHCi0JdXRfYWQoIWlidWZfaW5zaWRl
KCkgfHwgaWJ1Zl9wYWdlKHNwYWNlLCB6aXBfc2l6ZSwgb2Zmc2V0LCBOVUxMKSk7CisJdXRfYWQo
IWlidWZfaW5zaWRlKCkgfHwgaWJ1Zl9wYWdlX2xvdyhzcGFjZSwgemlwX3NpemUsIG9mZnNldCwK
KwkJCQkJICAgICAgRkFMU0UsIGZpbGUsIGxpbmUsIE5VTEwpKTsKICNlbmRpZgogCWJ1Zl9wb29s
LT5zdGF0Lm5fcGFnZV9nZXRzKys7CiAJZm9sZCA9IGJ1Zl9wYWdlX2FkZHJlc3NfZm9sZChzcGFj
ZSwgb2Zmc2V0KTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1
ZjBpYnVmLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwlyZXZpZDpz
dW5ueS5iYWluc0BvcmFjbGUuY29tLTIwMTAxMTMwMDU1MTQwLTUyanp6cDA2dnBwNDlueTIKKysr
IGIvc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTAxMTMwMTQwOTEwLW8zbXl6Zzc0Znk4NWhqemMKQEAgLTY1NiwyMiArNjU2
LDM5IEBAIGlidWZfcGFyc2VfYml0bWFwX2luaXQoCiAJcmV0dXJuKHB0cik7CiB9CiAjaWZuZGVm
IFVOSVZfSE9UQkFDS1VQCisjIGlmZGVmIFVOSVZfREVCVUcKKy8qKiBHZXRzIHRoZSBkZXNpcmVk
IGJpdHMgZm9yIGEgZ2l2ZW4gcGFnZSBmcm9tIGEgYml0bWFwIHBhZ2UuCitAcmV0dXJuCXZhbHVl
IG9mIGJpdHMgKi8KKyMgIGRlZmluZSBpYnVmX2JpdG1hcF9wYWdlX2dldF9iaXRzKHBhZ2UsIG9m
ZnNldCwgenMsIGJpdCwgbXRyKQlcCisJaWJ1Zl9iaXRtYXBfcGFnZV9nZXRfYml0c19sb3cocGFn
ZSwgb2Zmc2V0LCB6cywJXAorCQkJCSAgICAgIE1UUl9NRU1PX1BBR0VfWF9GSVgsIG10ciwgYml0
KQorIyBlbHNlIC8qIFVOSVZfREVCVUcgKi8KKy8qKiBHZXRzIHRoZSBkZXNpcmVkIGJpdHMgZm9y
IGEgZ2l2ZW4gcGFnZSBmcm9tIGEgYml0bWFwIHBhZ2UuCitAcmV0dXJuCXZhbHVlIG9mIGJpdHMg
Ki8KKyMgIGRlZmluZSBpYnVmX2JpdG1hcF9wYWdlX2dldF9iaXRzKHBhZ2UsIG9mZnNldCwgenMs
IGJpdCwgbXRyKQkJXAorCWlidWZfYml0bWFwX3BhZ2VfZ2V0X2JpdHNfbG93KHBhZ2UsIG9mZnNl
dCwgenMsIGJpdCkKKyMgZW5kaWYgLyogVU5JVl9ERUJVRyAqLworCiAvKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoq
CiBHZXRzIHRoZSBkZXNpcmVkIGJpdHMgZm9yIGEgZ2l2ZW4gcGFnZSBmcm9tIGEgYml0bWFwIHBh
Z2UuCiBAcmV0dXJuCXZhbHVlIG9mIGJpdHMgKi8KIFVOSVZfSU5MSU5FCiB1bGludAotaWJ1Zl9i
aXRtYXBfcGFnZV9nZXRfYml0cygKLS8qPT09PT09PT09PT09PT09PT09PT09PSovCitpYnVmX2Jp
dG1hcF9wYWdlX2dldF9iaXRzX2xvdygKKy8qPT09PT09PT09PT09PT09PT09PT09PT09PT0qLwog
CWNvbnN0IHBhZ2VfdCoJcGFnZSwJLyohPCBpbjogYml0bWFwIHBhZ2UgKi8KIAl1bGludAkJcGFn
ZV9ubywvKiE8IGluOiBwYWdlIHdob3NlIGJpdHMgdG8gZ2V0ICovCiAJdWxpbnQJCXppcF9zaXpl
LC8qITwgaW46IGNvbXByZXNzZWQgcGFnZSBzaXplIGluIGJ5dGVzOwogCQkJCTAgZm9yIHVuY29t
cHJlc3NlZCBwYWdlcyAqLwotCXVsaW50CQliaXQsCS8qITwgaW46IElCVUZfQklUTUFQX0ZSRUUs
Ci0JCQkJSUJVRl9CSVRNQVBfQlVGRkVSRUQsIC4uLiAqLwotCW10cl90KgkJbXRyIF9fYXR0cmli
dXRlX18oKHVudXNlZCkpKQotCQkJCS8qITwgaW46IG10ciBjb250YWluaW5nIGFuCisjaWZkZWYg
VU5JVl9ERUJVRworCXVsaW50CQlsYXRjaF90eXBlLAorCQkJCS8qITwgaW46IE1UUl9NRU1PX1BB
R0VfWF9GSVgsCisJCQkJTVRSX01FTU9fQlVGX0ZJWCwgLi4uICovCisJbXRyX3QqCQltdHIsCS8q
ITwgaW46IG10ciBjb250YWluaW5nIGFuCiAJCQkJeC1sYXRjaCB0byB0aGUgYml0bWFwIHBhZ2Ug
Ki8KKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCisJdWxpbnQJCWJpdCkJLyohPCBpbjogSUJVRl9C
SVRNQVBfRlJFRSwKKwkJCQlJQlVGX0JJVE1BUF9CVUZGRVJFRCwgLi4uICovCiB7CiAJdWxpbnQJ
Ynl0ZV9vZmZzZXQ7CiAJdWxpbnQJYml0X29mZnNldDsKQEAgLTY4Myw3ICs3MDAsNyBAQCBpYnVm
X2JpdG1hcF9wYWdlX2dldF9iaXRzKAogIyBlcnJvciAiSUJVRl9CSVRTX1BFUl9QQUdFICUgMiAh
PSAwIgogI2VuZGlmCiAJdXRfYWQodXRfaXNfMnBvdyh6aXBfc2l6ZSkpOwotCXV0X2FkKG10cl9t
ZW1vX2NvbnRhaW5zX3BhZ2UobXRyLCBwYWdlLCBNVFJfTUVNT19QQUdFX1hfRklYKSk7CisJdXRf
YWQobXRyX21lbW9fY29udGFpbnNfcGFnZShtdHIsIHBhZ2UsIGxhdGNoX3R5cGUpKTsKIAogCWlm
ICghemlwX3NpemUpIHsKIAkJYml0X29mZnNldCA9IChwYWdlX25vICUgVU5JVl9QQUdFX1NJWkUp
ICogSUJVRl9CSVRTX1BFUl9QQUdFCkBAIC0xMTA5LDIxICsxMTI2LDI5IEBAIE11c3Qgbm90IGJl
IGNhbGxlZCB3aGVuIHJlY3Zfbm9faWJ1Zl9vcGUKIEByZXR1cm4JVFJVRSBpZiBsZXZlbCAyIG9y
IGxldmVsIDMgcGFnZSAqLwogVU5JVl9JTlRFUk4KIGlib29sCi1pYnVmX3BhZ2UoCi0vKj09PT09
PSovCi0JdWxpbnQJc3BhY2UsCS8qITwgaW46IHNwYWNlIGlkICovCi0JdWxpbnQJemlwX3NpemUs
LyohPCBpbjogY29tcHJlc3NlZCBwYWdlIHNpemUgaW4gYnl0ZXMsIG9yIDAgKi8KLQl1bGludAlw
YWdlX25vLC8qITwgaW46IHBhZ2UgbnVtYmVyICovCi0JbXRyX3QqCW10cikJLyohPCBpbjogbXRy
IHdoaWNoIHdpbGwgY29udGFpbiBhbiB4LWxhdGNoIHRvIHRoZQotCQkJYml0bWFwIHBhZ2UgaWYg
dGhlIHBhZ2UgaXMgbm90IG9uZSBvZiB0aGUgZml4ZWQKLQkJCWFkZHJlc3MgaWJ1ZiBwYWdlcywg
b3IgTlVMTCwgaW4gd2hpY2ggY2FzZSBhIG5ldwotCQkJdHJhbnNhY3Rpb24gaXMgY3JlYXRlZC4g
Ki8KK2lidWZfcGFnZV9sb3coCisvKj09PT09PT09PT0qLworCXVsaW50CQlzcGFjZSwJLyohPCBp
bjogc3BhY2UgaWQgKi8KKwl1bGludAkJemlwX3NpemUsLyohPCBpbjogY29tcHJlc3NlZCBwYWdl
IHNpemUgaW4gYnl0ZXMsIG9yIDAgKi8KKwl1bGludAkJcGFnZV9ubywvKiE8IGluOiBwYWdlIG51
bWJlciAqLworI2lmZGVmIFVOSVZfREVCVUcKKwlpYm9vbAkJeF9sYXRjaCwvKiE8IGluOiBGQUxT
RSBpZiByZWxheGVkIGNoZWNrCisJCQkJKGF2b2lkIGxhdGNoaW5nIHRoZSBiaXRtYXAgcGFnZSkg
Ki8KKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCisJY29uc3QgY2hhcioJZmlsZSwJLyohPCBpbjog
ZmlsZSBuYW1lICovCisJdWxpbnQJCWxpbmUsCS8qITwgaW46IGxpbmUgd2hlcmUgY2FsbGVkICov
CisJbXRyX3QqCQltdHIpCS8qITwgaW46IG10ciB3aGljaCB3aWxsIGNvbnRhaW4gYW4KKwkJCQl4
LWxhdGNoIHRvIHRoZSBiaXRtYXAgcGFnZSBpZiB0aGUgcGFnZQorCQkJCWlzIG5vdCBvbmUgb2Yg
dGhlIGZpeGVkIGFkZHJlc3MgaWJ1ZgorCQkJCXBhZ2VzLCBvciBOVUxMLCBpbiB3aGljaCBjYXNl
IGEgbmV3CisJCQkJdHJhbnNhY3Rpb24gaXMgY3JlYXRlZC4gKi8KIHsKIAlpYm9vbAlyZXQ7CiAJ
bXRyX3QJbG9jYWxfbXRyOwogCXBhZ2VfdCoJYml0bWFwX3BhZ2U7CiAKIAl1dF9hZCghcmVjdl9u
b19pYnVmX29wZXJhdGlvbnMpOworCXV0X2FkKHhfbGF0Y2ggfHwgbXRyID09IE5VTEwpOwogCiAJ
aWYgKGlidWZfZml4ZWRfYWRkcl9wYWdlKHNwYWNlLCB6aXBfc2l6ZSwgcGFnZV9ubykpIHsKIApA
QCAtMTEzNSwxMiArMTE2MCw1MCBAQCBpYnVmX3BhZ2UoCiAKIAl1dF9hZChmaWxfc3BhY2VfZ2V0
X3R5cGUoSUJVRl9TUEFDRV9JRCkgPT0gRklMX1RBQkxFU1BBQ0UpOwogCisjaWZkZWYgVU5JVl9E
RUJVRworCWlmICgheF9sYXRjaCkgeworCQltdHJfc3RhcnQoJmxvY2FsX210cik7CisKKwkJLyog
R2V0IHRoZSBiaXRtYXAgcGFnZSB3aXRob3V0IGEgcGFnZSBsYXRjaCwgc28gdGhhdAorCQl3ZSB3
aWxsIG5vdCBiZSB2aW9sYXRpbmcgdGhlIGxhdGNoaW5nIG9yZGVyIHdoZW4KKwkJYW5vdGhlciBi
aXRtYXAgcGFnZSBoYXMgYWxyZWFkeSBiZWVuIGxhdGNoZWQgYnkgdGhpcworCQl0aHJlYWQuIFRo
ZSBwYWdlIHdpbGwgYmUgYnVmZmVyLWZpeGVkLCBhbmQgdGh1cyBpdAorCQljYW5ub3QgYmUgcmVt
b3ZlZCBvciByZWxvY2F0ZWQgd2hpbGUgd2UgYXJlIGxvb2tpbmcgYXQKKwkJaXQuIFRoZSBjb250
ZW50cyBvZiB0aGUgcGFnZSBjb3VsZCBjaGFuZ2UsIGJ1dCB0aGUKKwkJSUJVRl9CSVRNQVBfSUJV
RiBiaXQgdGhhdCB3ZSBhcmUgaW50ZXJlc3RlZCBpbiBzaG91bGQKKwkJbm90IGJlIG1vZGlmaWVk
IGJ5IGFueSBvdGhlciB0aHJlYWQuIE5vYm9keSBzaG91bGQgYmUKKwkJY2FsbGluZyBpYnVmX2Fk
ZF9mcmVlX3BhZ2UoKSBvciBpYnVmX3JlbW92ZV9mcmVlX3BhZ2UoKQorCQl3aGlsZSB0aGUgcGFn
ZSBpcyBsaW5rZWQgdG8gdGhlIGluc2VydCBidWZmZXIgYi10cmVlLiAqLworCisJCWJpdG1hcF9w
YWdlID0gYnVmX2Jsb2NrX2dldF9mcmFtZSgKKwkJCWJ1Zl9wYWdlX2dldF9nZW4oCisJCQkJc3Bh
Y2UsIHppcF9zaXplLAorCQkJCWlidWZfYml0bWFwX3BhZ2Vfbm9fY2FsYyh6aXBfc2l6ZSwgcGFn
ZV9ubyksCisJCQkJUldfTk9fTEFUQ0gsIE5VTEwsIEJVRl9HRVRfTk9fTEFUQ0gsCisJCQkJZmls
ZSwgbGluZSwgJmxvY2FsX210cikpOworIyBpZmRlZiBVTklWX1NZTkNfREVCVUcKKwkJdm9pZCog
bGF0Y2ggPSBzeW5jX3RocmVhZF9sZXZlbHNfY29udGFpbnMoU1lOQ19JQlVGX0JJVE1BUCk7CisJ
CWlmIChsYXRjaCkgeworCQkJZnByaW50ZihzdGRlcnIsICJsZXZlbHMgJXAgKCV1LCV1KVxuIiwK
KwkJCQlsYXRjaCwgKHVuc2lnbmVkKSBzcGFjZSwgKHVuc2lnbmVkKSBwYWdlX25vKTsKKwkJfQor
IyBlbmRpZiAvKiBVTklWX1NZTkNfREVCVUcgKi8KKwkJcmV0ID0gaWJ1Zl9iaXRtYXBfcGFnZV9n
ZXRfYml0c19sb3coCisJCQliaXRtYXBfcGFnZSwgcGFnZV9ubywgemlwX3NpemUsCisJCQlNVFJf
TUVNT19CVUZfRklYLCAmbG9jYWxfbXRyLCBJQlVGX0JJVE1BUF9JQlVGKTsKKworCQltdHJfY29t
bWl0KCZsb2NhbF9tdHIpOworCQlyZXR1cm4ocmV0KTsKKwl9CisjZW5kaWYgLyogVU5JVl9ERUJV
RyAqLworCiAJaWYgKG10ciA9PSBOVUxMKSB7CiAJCW10ciA9ICZsb2NhbF9tdHI7CiAJCW10cl9z
dGFydChtdHIpOwogCX0KIAotCWJpdG1hcF9wYWdlID0gaWJ1Zl9iaXRtYXBfZ2V0X21hcF9wYWdl
KHNwYWNlLCBwYWdlX25vLCB6aXBfc2l6ZSwgbXRyKTsKKwliaXRtYXBfcGFnZSA9IGlidWZfYml0
bWFwX2dldF9tYXBfcGFnZV9mdW5jKHNwYWNlLCBwYWdlX25vLCB6aXBfc2l6ZSwKKwkJCQkJCSAg
ICBmaWxlLCBsaW5lLCBtdHIpOwogCiAJcmV0ID0gaWJ1Zl9iaXRtYXBfcGFnZV9nZXRfYml0cyhi
aXRtYXBfcGFnZSwgcGFnZV9ubywgemlwX3NpemUsCiAJCQkJCUlCVUZfQklUTUFQX0lCVUYsIG10
cik7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2lidWYwaWJ1
Zi5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvaWJ1ZjBpYnVmLmgJcmV2aWQ6c3Vu
bnkuYmFpbnNAb3JhY2xlLmNvbS0yMDEwMTEzMDA1NTE0MC01Mmp6enAwNnZwcDQ5bnkyCisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9pYnVmMGlidWYuaAlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDEwMTEzMDE0MDkxMC1vM215emc3NGZ5ODVoanpjCkBAIC0yNDQsMTUgKzI0
NCw0NCBAQCBNdXN0IG5vdCBiZSBjYWxsZWQgd2hlbiByZWN2X25vX2lidWZfb3BlCiBAcmV0dXJu
CVRSVUUgaWYgbGV2ZWwgMiBvciBsZXZlbCAzIHBhZ2UgKi8KIFVOSVZfSU5URVJOCiBpYm9vbAot
aWJ1Zl9wYWdlKAotLyo9PT09PT0qLwotCXVsaW50CXNwYWNlLAkvKiE8IGluOiBzcGFjZSBpZCAq
LwotCXVsaW50CXppcF9zaXplLC8qITwgaW46IGNvbXByZXNzZWQgcGFnZSBzaXplIGluIGJ5dGVz
LCBvciAwICovCi0JdWxpbnQJcGFnZV9ubywvKiE8IGluOiBwYWdlIG51bWJlciAqLwotCW10cl90
KgltdHIpOwkvKiE8IGluOiBtdHIgd2hpY2ggd2lsbCBjb250YWluIGFuIHgtbGF0Y2ggdG8gdGhl
Ci0JCQliaXRtYXAgcGFnZSBpZiB0aGUgcGFnZSBpcyBub3Qgb25lIG9mIHRoZSBmaXhlZAotCQkJ
YWRkcmVzcyBpYnVmIHBhZ2VzLCBvciBOVUxMLCBpbiB3aGljaCBjYXNlIGEgbmV3Ci0JCQl0cmFu
c2FjdGlvbiBpcyBjcmVhdGVkLiAqLworaWJ1Zl9wYWdlX2xvdygKKy8qPT09PT09PT09PSovCisJ
dWxpbnQJCXNwYWNlLAkvKiE8IGluOiBzcGFjZSBpZCAqLworCXVsaW50CQl6aXBfc2l6ZSwvKiE8
IGluOiBjb21wcmVzc2VkIHBhZ2Ugc2l6ZSBpbiBieXRlcywgb3IgMCAqLworCXVsaW50CQlwYWdl
X25vLC8qITwgaW46IHBhZ2UgbnVtYmVyICovCisjaWZkZWYgVU5JVl9ERUJVRworCWlib29sCQl4
X2xhdGNoLC8qITwgaW46IEZBTFNFIGlmIHJlbGF4ZWQgY2hlY2sKKwkJCQkoYXZvaWQgbGF0Y2hp
bmcgdGhlIGJpdG1hcCBwYWdlKSAqLworI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KKwljb25zdCBj
aGFyKglmaWxlLAkvKiE8IGluOiBmaWxlIG5hbWUgKi8KKwl1bGludAkJbGluZSwJLyohPCBpbjog
bGluZSB3aGVyZSBjYWxsZWQgKi8KKwltdHJfdCoJCW10cikJLyohPCBpbjogbXRyIHdoaWNoIHdp
bGwgY29udGFpbiBhbgorCQkJCXgtbGF0Y2ggdG8gdGhlIGJpdG1hcCBwYWdlIGlmIHRoZSBwYWdl
CisJCQkJaXMgbm90IG9uZSBvZiB0aGUgZml4ZWQgYWRkcmVzcyBpYnVmCisJCQkJcGFnZXMsIG9y
IE5VTEwsIGluIHdoaWNoIGNhc2UgYSBuZXcKKwkJCQl0cmFuc2FjdGlvbiBpcyBjcmVhdGVkLiAq
LworCV9fYXR0cmlidXRlX18oKHdhcm5fdW51c2VkX3Jlc3VsdCkpOworI2lmZGVmIFVOSVZfREVC
VUcKKy8qKiBDaGVja3MgaWYgYSBwYWdlIGlzIGEgbGV2ZWwgMiBvciAzIHBhZ2UgaW4gdGhlIGli
dWYgaGllcmFyY2h5IG9mCitwYWdlcy4gIE11c3Qgbm90IGJlIGNhbGxlZCB3aGVuIHJlY3Zfbm9f
aWJ1Zl9vcGVyYXRpb25zPT1UUlVFLgorQHBhcmFtIHNwYWNlCXRhYmxlc3BhY2UgaWRlbnRpZmll
cgorQHBhcmFtIHppcF9zaXplCWNvbXByZXNzZWQgcGFnZSBzaXplIGluIGJ5dGVzLCBvciAwCitA
cGFyYW0gcGFnZV9ubwlwYWdlIG51bWJlcgorQHBhcmFtIG10cgltaW5pLXRyYW5zYWN0aW9uIG9y
IE5VTEwKK0ByZXR1cm4gVFJVRSBpZiBsZXZlbCAyIG9yIGxldmVsIDMgcGFnZSAqLworIyBkZWZp
bmUgaWJ1Zl9wYWdlKHNwYWNlLCB6aXBfc2l6ZSwgcGFnZV9ubywgbXRyKQkJCVwKKwlpYnVmX3Bh
Z2VfbG93KHNwYWNlLCB6aXBfc2l6ZSwgcGFnZV9ubywgVFJVRSwgX19GSUxFX18sIF9fTElORV9f
LCBtdHIpCisjZWxzZSAvKiBVVklWX0RFQlVHICovCisvKiogQ2hlY2tzIGlmIGEgcGFnZSBpcyBh
IGxldmVsIDIgb3IgMyBwYWdlIGluIHRoZSBpYnVmIGhpZXJhcmNoeSBvZgorcGFnZXMuICBNdXN0
IG5vdCBiZSBjYWxsZWQgd2hlbiByZWN2X25vX2lidWZfb3BlcmF0aW9ucz09VFJVRS4KK0BwYXJh
bSBzcGFjZQl0YWJsZXNwYWNlIGlkZW50aWZpZXIKK0BwYXJhbSB6aXBfc2l6ZQljb21wcmVzc2Vk
IHBhZ2Ugc2l6ZSBpbiBieXRlcywgb3IgMAorQHBhcmFtIHBhZ2Vfbm8JcGFnZSBudW1iZXIKK0Bw
YXJhbSBtdHIJbWluaS10cmFuc2FjdGlvbiBvciBOVUxMCitAcmV0dXJuIFRSVUUgaWYgbGV2ZWwg
MiBvciBsZXZlbCAzIHBhZ2UgKi8KKyMgZGVmaW5lIGlidWZfcGFnZShzcGFjZSwgemlwX3NpemUs
IHBhZ2Vfbm8sIG10cikJCQlcCisJaWJ1Zl9wYWdlX2xvdyhzcGFjZSwgemlwX3NpemUsIHBhZ2Vf
bm8sIF9fRklMRV9fLCBfX0xJTkVfXywgbXRyKQorI2VuZGlmIC8qIFVWSVZfREVCVUcgKi8KIC8q
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKi8vKioKIEZyZWVzIGV4Y2VzcyBwYWdlcyBmcm9tIHRoZSBpYnVmIGZyZWUg
bGlzdC4gVGhpcyBmdW5jdGlvbiBpcyBjYWxsZWQgd2hlbiBhbiBPUwogdGhyZWFkIGNhbGxzIGZz
cCBzZXJ2aWNlcyB0byBhbGxvY2F0ZSBhIG5ldyBmaWxlIHNlZ21lbnQsIG9yIGEgbmV3IHBhZ2Ug
dG8gYQoK

--===============0057402370==
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.5-innodb/
# testament_sha1: 3cf9fb2f252a8ad2d3bb81e291dfa409e8cb0157
# timestamp: 2010-11-30 16:09:24 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: sunny.bains@stripped\
#   52jzzp06vpp49ny2
# 
# Begin bundle
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
P/F3JFOFCQP24MsA


--===============0057402370==--