From: marko.makela
Date: December 1 2010 1:09pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3250) Bug#58212
List-Archive: http://lists.mysql.com/commits/125662
X-Bug: 58212
Message-Id: <201012011340.oAUDF8KW022776@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0475821227=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTA4NDMzMy1jNWls
a3Jld3FibGZvcGc3CgogMzI1MCBNYXJrbyBNw6RrZWzDpAkyMDEwLTEyLTAxCiAgICAgIEJ1ZyM1
ODIxMiBQb3NzaWJsZSBkZWFkbG9jayBpbiBjaGFuZ2UgYnVmZmVyIGluIGRlYnVnIGJ1aWxkcwog
ICAgICAKICAgICAgaWJ1Zl9wYWdlKCk6IFJlbmFtZWQgdG8gaWJ1Zl9wYWdlX2xvdygpLiBBZGQg
dGhlIHBhcmFtZXRlcnMgZmlsZSwgbGluZQogICAgICBzbyB0aGF0IHRoZSBsYXRjaCBkaWFnbm9z
dGljcyB3aWxsIGJlIG1vcmUgbWVhbmluZ2Z1bC4KICAgICAgSW4gZGVidWcgYnVpbGRzLCBhZGQg
dGhlIHBhcmFtZXRlciBpYm9vbCB4X2xhdGNoLiBXaGVuIHhfbGF0Y2g9RkFMU0UsCiAgICAgIGRv
IG5vdCB4LWxhdGNoIHRoZSBwYWdlLCBidXQgb25seSBidWZmZXItZml4IGl0IGZvciByZWFkaW5n
IHRoZSBiaXQuCiAgICAgIEluIFVOSVZfU1lOQ19ERUJVRywgZGlzcGxheSBhIG1lc3NhZ2UgaWYg
YW4gaW5zZXJ0IGJ1ZmZlciBiaXRtYXAgcGFnZQogICAgICB3YXMgYWxyZWFkeSBsYXRjaGVkLiAo
VGhlIG1lc3NhZ2Ugc2hvdWxkIGJlIGRpc3BsYXllZCBpbiB0aG9zZSBjYXNlcwogICAgICB3aGVy
ZSB0aGUgY29kZSB3b3VsZCBoYXZlIHByZXZpb3VzbHkgZmFpbGVkLikKICAgICAgCiAgICAgIGli
dWZfcGFnZSgpOiBBIHdyYXBwZXIgbWFjcm8gZm9yIGlidWZfcGFnZV9sb3coKS4gUGFzcyB4X2xh
dGNoPVRSVUUuCiAgICAgIAogICAgICBpYnVmX2JpdG1hcF9wYWdlX2dldF9iaXRzKCk6IFJlbmFt
ZWQgdG8gaWJ1Zl9iaXRtYXBfcGFnZV9nZXRfYml0c19sb3coKS4KICAgICAgSW4gVU5JVl9ERUJV
RywgYWRkIHRoZSBwYXJhbWV0ZXIgbGF0Y2hfbW9kZS4KICAgICAgUmVtb3ZlIHRoZSBwYXJhbWV0
ZXIgbXRyIHVubGVzcyBVTklWX0RFQlVHIGlzIGRlZmluZWQuCiAgICAgIAogICAgICBpYnVmX2Jp
dG1hcF9wYWdlX2dldF9iaXRzKCk6IEEgd3JhcHBlciBtYWNybyBmb3IKICAgICAgaWJ1Zl9iaXRt
YXBfcGFnZV9nZXRfYml0c19sb3coKS4gUGFzcyBsYXRjaF90eXBlPU1UUl9NRU1PX1BBR0VfWF9G
SVguCiAgICAgIAogICAgICBidWZfcGFnZV9nZXRfZ2VuKCk6IFVzZSBpYnVmX3BhZ2VfbG93KHhf
bGF0Y2g9RkFMU0UpIGluIHRoZSBkZWJ1ZyBhc3NlcnRpb24uCiAgICAgIFRoaXMgYXZvaWRzIHRo
ZSBwb3NzaWJsZSBkZWFkbG9jay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9idWYvYnVmMGJ1Zi5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwog
ICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvaWJ1ZjBpYnVmLmgKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFz
ZS9idWYvYnVmMGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjAxMDg0
MzMzLWM1aWxrcmV3cWJsZm9wZzcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5j
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjAxMTMwOTAyLXEwZzU0dWZpaTA2
b3I0b2UKQEAgLTI3NDUsNyArMjc0NSw4IEBAIGJ1Zl9wYWdlX2dldF9nZW4oCiAJdXRfYWQoemlw
X3NpemUgPT0gZmlsX3NwYWNlX2dldF96aXBfc2l6ZShzcGFjZSkpOwogCXV0X2FkKHV0X2lzXzJw
b3coemlwX3NpemUpKTsKICNpZm5kZWYgVU5JVl9MT0dfREVCVUcKLQl1dF9hZCghaWJ1Zl9pbnNp
ZGUoKSB8fCBpYnVmX3BhZ2Uoc3BhY2UsIHppcF9zaXplLCBvZmZzZXQsIE5VTEwpKTsKKwl1dF9h
ZCghaWJ1Zl9pbnNpZGUoKSB8fCBpYnVmX3BhZ2VfbG93KHNwYWNlLCB6aXBfc2l6ZSwgb2Zmc2V0
LAorCQkJCQkgICAgICBGQUxTRSwgZmlsZSwgbGluZSwgTlVMTCkpOwogI2VuZGlmCiAJYnVmX3Bv
b2wtPnN0YXQubl9wYWdlX2dldHMrKzsKIAlmb2xkID0gYnVmX3BhZ2VfYWRkcmVzc19mb2xkKHNw
YWNlLCBvZmZzZXQpOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9p
YnVmMGlidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMjAxMDg0MzMzLWM1aWxrcmV3cWJsZm9wZzcK
KysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAxMjAxMTMwOTAyLXEwZzU0dWZpaTA2b3I0b2UKQEAgLTY1NiwyMiAr
NjU2LDQ5IEBAIGlidWZfcGFyc2VfYml0bWFwX2luaXQoCiAJcmV0dXJuKHB0cik7CiB9CiAjaWZu
ZGVmIFVOSVZfSE9UQkFDS1VQCisjIGlmZGVmIFVOSVZfREVCVUcKKy8qKiBHZXRzIHRoZSBkZXNp
cmVkIGJpdHMgZm9yIGEgZ2l2ZW4gcGFnZSBmcm9tIGEgYml0bWFwIHBhZ2UuCitAcGFyYW0gcGFn
ZQlpbjogYml0bWFwIHBhZ2UKK0BwYXJhbSBvZmZzZXQJaW46IHBhZ2Ugd2hvc2UgYml0cyB0byBn
ZXQKK0BwYXJhbSB6cwlpbjogY29tcHJlc3NlZCBwYWdlIHNpemUgaW4gYnl0ZXM7IDAgZm9yIHVu
Y29tcHJlc3NlZCBwYWdlcworQHBhcmFtIGJpdAlpbjogSUJVRl9CSVRNQVBfRlJFRSwgSUJVRl9C
SVRNQVBfQlVGRkVSRUQsIC4uLgorQHBhcmFtIG10cglpbjogbWluaS10cmFuc2FjdGlvbiBob2xk
aW5nIGFuIHgtbGF0Y2ggb24gdGhlIGJpdG1hcCBwYWdlCitAcmV0dXJuCXZhbHVlIG9mIGJpdHMg
Ki8KKyMgIGRlZmluZSBpYnVmX2JpdG1hcF9wYWdlX2dldF9iaXRzKHBhZ2UsIG9mZnNldCwgenMs
IGJpdCwgbXRyKQlcCisJaWJ1Zl9iaXRtYXBfcGFnZV9nZXRfYml0c19sb3cocGFnZSwgb2Zmc2V0
LCB6cywJXAorCQkJCSAgICAgIE1UUl9NRU1PX1BBR0VfWF9GSVgsIG10ciwgYml0KQorIyBlbHNl
IC8qIFVOSVZfREVCVUcgKi8KKy8qKiBHZXRzIHRoZSBkZXNpcmVkIGJpdHMgZm9yIGEgZ2l2ZW4g
cGFnZSBmcm9tIGEgYml0bWFwIHBhZ2UuCitAcGFyYW0gcGFnZQlpbjogYml0bWFwIHBhZ2UKK0Bw
YXJhbSBvZmZzZXQJaW46IHBhZ2Ugd2hvc2UgYml0cyB0byBnZXQKK0BwYXJhbSB6cwlpbjogY29t
cHJlc3NlZCBwYWdlIHNpemUgaW4gYnl0ZXM7IDAgZm9yIHVuY29tcHJlc3NlZCBwYWdlcworQHBh
cmFtIGJpdAlpbjogSUJVRl9CSVRNQVBfRlJFRSwgSUJVRl9CSVRNQVBfQlVGRkVSRUQsIC4uLgor
QHBhcmFtIG10cglpbjogbWluaS10cmFuc2FjdGlvbiBob2xkaW5nIGFuIHgtbGF0Y2ggb24gdGhl
IGJpdG1hcCBwYWdlCitAcmV0dXJuCXZhbHVlIG9mIGJpdHMgKi8KKyMgIGRlZmluZSBpYnVmX2Jp
dG1hcF9wYWdlX2dldF9iaXRzKHBhZ2UsIG9mZnNldCwgenMsIGJpdCwgbXRyKQkJXAorCWlidWZf
Yml0bWFwX3BhZ2VfZ2V0X2JpdHNfbG93KHBhZ2UsIG9mZnNldCwgenMsIGJpdCkKKyMgZW5kaWYg
LyogVU5JVl9ERUJVRyAqLworCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBHZXRzIHRoZSBkZXNpcmVkIGJp
dHMgZm9yIGEgZ2l2ZW4gcGFnZSBmcm9tIGEgYml0bWFwIHBhZ2UuCiBAcmV0dXJuCXZhbHVlIG9m
IGJpdHMgKi8KIFVOSVZfSU5MSU5FCiB1bGludAotaWJ1Zl9iaXRtYXBfcGFnZV9nZXRfYml0cygK
LS8qPT09PT09PT09PT09PT09PT09PT09PSovCitpYnVmX2JpdG1hcF9wYWdlX2dldF9iaXRzX2xv
dygKKy8qPT09PT09PT09PT09PT09PT09PT09PT09PT0qLwogCWNvbnN0IHBhZ2VfdCoJcGFnZSwJ
LyohPCBpbjogYml0bWFwIHBhZ2UgKi8KIAl1bGludAkJcGFnZV9ubywvKiE8IGluOiBwYWdlIHdo
b3NlIGJpdHMgdG8gZ2V0ICovCiAJdWxpbnQJCXppcF9zaXplLC8qITwgaW46IGNvbXByZXNzZWQg
cGFnZSBzaXplIGluIGJ5dGVzOwogCQkJCTAgZm9yIHVuY29tcHJlc3NlZCBwYWdlcyAqLwotCXVs
aW50CQliaXQsCS8qITwgaW46IElCVUZfQklUTUFQX0ZSRUUsCisjaWZkZWYgVU5JVl9ERUJVRwor
CXVsaW50CQlsYXRjaF90eXBlLAorCQkJCS8qITwgaW46IE1UUl9NRU1PX1BBR0VfWF9GSVgsCisJ
CQkJTVRSX01FTU9fQlVGX0ZJWCwgLi4uICovCisJbXRyX3QqCQltdHIsCS8qITwgaW46IG1pbmkt
dHJhbnNhY3Rpb24gaG9sZGluZyBsYXRjaF90eXBlCisJCQkJb24gdGhlIGJpdG1hcCBwYWdlICov
CisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLworCXVsaW50CQliaXQpCS8qITwgaW46IElCVUZfQklU
TUFQX0ZSRUUsCiAJCQkJSUJVRl9CSVRNQVBfQlVGRkVSRUQsIC4uLiAqLwotCW10cl90KgkJbXRy
IF9fYXR0cmlidXRlX18oKHVudXNlZCkpKQotCQkJCS8qITwgaW46IG10ciBjb250YWluaW5nIGFu
Ci0JCQkJeC1sYXRjaCB0byB0aGUgYml0bWFwIHBhZ2UgKi8KIHsKIAl1bGludAlieXRlX29mZnNl
dDsKIAl1bGludAliaXRfb2Zmc2V0OwpAQCAtNjgzLDcgKzcxMCw3IEBAIGlidWZfYml0bWFwX3Bh
Z2VfZ2V0X2JpdHMoCiAjIGVycm9yICJJQlVGX0JJVFNfUEVSX1BBR0UgJSAyICE9IDAiCiAjZW5k
aWYKIAl1dF9hZCh1dF9pc18ycG93KHppcF9zaXplKSk7Ci0JdXRfYWQobXRyX21lbW9fY29udGFp
bnNfcGFnZShtdHIsIHBhZ2UsIE1UUl9NRU1PX1BBR0VfWF9GSVgpKTsKKwl1dF9hZChtdHJfbWVt
b19jb250YWluc19wYWdlKG10ciwgcGFnZSwgbGF0Y2hfdHlwZSkpOwogCiAJaWYgKCF6aXBfc2l6
ZSkgewogCQliaXRfb2Zmc2V0ID0gKHBhZ2Vfbm8gJSBVTklWX1BBR0VfU0laRSkgKiBJQlVGX0JJ
VFNfUEVSX1BBR0UKQEAgLTExMDksMjEgKzExMzYsMjkgQEAgTXVzdCBub3QgYmUgY2FsbGVkIHdo
ZW4gcmVjdl9ub19pYnVmX29wZQogQHJldHVybglUUlVFIGlmIGxldmVsIDIgb3IgbGV2ZWwgMyBw
YWdlICovCiBVTklWX0lOVEVSTgogaWJvb2wKLWlidWZfcGFnZSgKLS8qPT09PT09Ki8KLQl1bGlu
dAlzcGFjZSwJLyohPCBpbjogc3BhY2UgaWQgKi8KLQl1bGludAl6aXBfc2l6ZSwvKiE8IGluOiBj
b21wcmVzc2VkIHBhZ2Ugc2l6ZSBpbiBieXRlcywgb3IgMCAqLwotCXVsaW50CXBhZ2Vfbm8sLyoh
PCBpbjogcGFnZSBudW1iZXIgKi8KLQltdHJfdCoJbXRyKQkvKiE8IGluOiBtdHIgd2hpY2ggd2ls
bCBjb250YWluIGFuIHgtbGF0Y2ggdG8gdGhlCi0JCQliaXRtYXAgcGFnZSBpZiB0aGUgcGFnZSBp
cyBub3Qgb25lIG9mIHRoZSBmaXhlZAotCQkJYWRkcmVzcyBpYnVmIHBhZ2VzLCBvciBOVUxMLCBp
biB3aGljaCBjYXNlIGEgbmV3Ci0JCQl0cmFuc2FjdGlvbiBpcyBjcmVhdGVkLiAqLworaWJ1Zl9w
YWdlX2xvdygKKy8qPT09PT09PT09PSovCisJdWxpbnQJCXNwYWNlLAkvKiE8IGluOiBzcGFjZSBp
ZCAqLworCXVsaW50CQl6aXBfc2l6ZSwvKiE8IGluOiBjb21wcmVzc2VkIHBhZ2Ugc2l6ZSBpbiBi
eXRlcywgb3IgMCAqLworCXVsaW50CQlwYWdlX25vLC8qITwgaW46IHBhZ2UgbnVtYmVyICovCisj
aWZkZWYgVU5JVl9ERUJVRworCWlib29sCQl4X2xhdGNoLC8qITwgaW46IEZBTFNFIGlmIHJlbGF4
ZWQgY2hlY2sKKwkJCQkoYXZvaWQgbGF0Y2hpbmcgdGhlIGJpdG1hcCBwYWdlKSAqLworI2VuZGlm
IC8qIFVOSVZfREVCVUcgKi8KKwljb25zdCBjaGFyKglmaWxlLAkvKiE8IGluOiBmaWxlIG5hbWUg
Ki8KKwl1bGludAkJbGluZSwJLyohPCBpbjogbGluZSB3aGVyZSBjYWxsZWQgKi8KKwltdHJfdCoJ
CW10cikJLyohPCBpbjogbXRyIHdoaWNoIHdpbGwgY29udGFpbiBhbgorCQkJCXgtbGF0Y2ggdG8g
dGhlIGJpdG1hcCBwYWdlIGlmIHRoZSBwYWdlCisJCQkJaXMgbm90IG9uZSBvZiB0aGUgZml4ZWQg
YWRkcmVzcyBpYnVmCisJCQkJcGFnZXMsIG9yIE5VTEwsIGluIHdoaWNoIGNhc2UgYSBuZXcKKwkJ
CQl0cmFuc2FjdGlvbiBpcyBjcmVhdGVkLiAqLwogewogCWlib29sCXJldDsKIAltdHJfdAlsb2Nh
bF9tdHI7CiAJcGFnZV90KgliaXRtYXBfcGFnZTsKIAogCXV0X2FkKCFyZWN2X25vX2lidWZfb3Bl
cmF0aW9ucyk7CisJdXRfYWQoeF9sYXRjaCB8fCBtdHIgPT0gTlVMTCk7CiAKIAlpZiAoaWJ1Zl9m
aXhlZF9hZGRyX3BhZ2Uoc3BhY2UsIHppcF9zaXplLCBwYWdlX25vKSkgewogCkBAIC0xMTM1LDEy
ICsxMTcwLDU1IEBAIGlidWZfcGFnZSgKIAogCXV0X2FkKGZpbF9zcGFjZV9nZXRfdHlwZShJQlVG
X1NQQUNFX0lEKSA9PSBGSUxfVEFCTEVTUEFDRSk7CiAKKyNpZmRlZiBVTklWX0RFQlVHCisJaWYg
KCF4X2xhdGNoKSB7CisJCW10cl9zdGFydCgmbG9jYWxfbXRyKTsKKworCQkvKiBHZXQgdGhlIGJp
dG1hcCBwYWdlIHdpdGhvdXQgYSBwYWdlIGxhdGNoLCBzbyB0aGF0CisJCXdlIHdpbGwgbm90IGJl
IHZpb2xhdGluZyB0aGUgbGF0Y2hpbmcgb3JkZXIgd2hlbgorCQlhbm90aGVyIGJpdG1hcCBwYWdl
IGhhcyBhbHJlYWR5IGJlZW4gbGF0Y2hlZCBieSB0aGlzCisJCXRocmVhZC4gVGhlIHBhZ2Ugd2ls
bCBiZSBidWZmZXItZml4ZWQsIGFuZCB0aHVzIGl0CisJCWNhbm5vdCBiZSByZW1vdmVkIG9yIHJl
bG9jYXRlZCB3aGlsZSB3ZSBhcmUgbG9va2luZyBhdAorCQlpdC4gVGhlIGNvbnRlbnRzIG9mIHRo
ZSBwYWdlIGNvdWxkIGNoYW5nZSwgYnV0IHRoZQorCQlJQlVGX0JJVE1BUF9JQlVGIGJpdCB0aGF0
IHdlIGFyZSBpbnRlcmVzdGVkIGluIHNob3VsZAorCQlub3QgYmUgbW9kaWZpZWQgYnkgYW55IG90
aGVyIHRocmVhZC4gTm9ib2R5IHNob3VsZCBiZQorCQljYWxsaW5nIGlidWZfYWRkX2ZyZWVfcGFn
ZSgpIG9yIGlidWZfcmVtb3ZlX2ZyZWVfcGFnZSgpCisJCXdoaWxlIHRoZSBwYWdlIGlzIGxpbmtl
ZCB0byB0aGUgaW5zZXJ0IGJ1ZmZlciBiLXRyZWUuICovCisKKwkJYml0bWFwX3BhZ2UgPSBidWZf
YmxvY2tfZ2V0X2ZyYW1lKAorCQkJYnVmX3BhZ2VfZ2V0X2dlbigKKwkJCQlzcGFjZSwgemlwX3Np
emUsCisJCQkJaWJ1Zl9iaXRtYXBfcGFnZV9ub19jYWxjKHppcF9zaXplLCBwYWdlX25vKSwKKwkJ
CQlSV19OT19MQVRDSCwgTlVMTCwgQlVGX0dFVF9OT19MQVRDSCwKKwkJCQlmaWxlLCBsaW5lLCAm
bG9jYWxfbXRyKSk7CisjIGlmZGVmIFVOSVZfU1lOQ19ERUJVRworCQkvKiBUaGlzIGlzIGZvciB0
cmFja2luZyBCdWcgIzU4MjEyLiBUaGlzIGNoZWNrIGFuZCBtZXNzYWdlIGNhbgorCQliZSByZW1v
dmVkIG9uY2UgaXQgaGFzIGJlZW4gZXN0YWJsaXNoZWQgdGhhdCBvdXIgYXNzdW1wdGlvbnMKKwkJ
YWJvdXQgdGhpcyBjb25kaXRpb24gYXJlIGNvcnJlY3QuIFRoZSBidWcgd2FzIG9ubHkgYSBvbmUt
dGltZQorCQlvY2N1cnJlbmNlLCB1bmFibGUgdG8gcmVwZWF0IHNpbmNlIHRoZW4uICovCisJCXZv
aWQqIGxhdGNoID0gc3luY190aHJlYWRfbGV2ZWxzX2NvbnRhaW5zKFNZTkNfSUJVRl9CSVRNQVAp
OworCQlpZiAobGF0Y2gpIHsKKwkJCWZwcmludGYoc3RkZXJyLCAiQnVnIzU4MjEyIFVOSVZfU1lO
Q19ERUJVRyIKKwkJCQkiIGxldmVscyAlcCAoJXUsJXUpXG4iLAorCQkJCWxhdGNoLCAodW5zaWdu
ZWQpIHNwYWNlLCAodW5zaWduZWQpIHBhZ2Vfbm8pOworCQl9CisjIGVuZGlmIC8qIFVOSVZfU1lO
Q19ERUJVRyAqLworCQlyZXQgPSBpYnVmX2JpdG1hcF9wYWdlX2dldF9iaXRzX2xvdygKKwkJCWJp
dG1hcF9wYWdlLCBwYWdlX25vLCB6aXBfc2l6ZSwKKwkJCU1UUl9NRU1PX0JVRl9GSVgsICZsb2Nh
bF9tdHIsIElCVUZfQklUTUFQX0lCVUYpOworCisJCW10cl9jb21taXQoJmxvY2FsX210cik7CisJ
CXJldHVybihyZXQpOworCX0KKyNlbmRpZiAvKiBVTklWX0RFQlVHICovCisKIAlpZiAobXRyID09
IE5VTEwpIHsKIAkJbXRyID0gJmxvY2FsX210cjsKIAkJbXRyX3N0YXJ0KG10cik7CiAJfQogCi0J
Yml0bWFwX3BhZ2UgPSBpYnVmX2JpdG1hcF9nZXRfbWFwX3BhZ2Uoc3BhY2UsIHBhZ2Vfbm8sIHpp
cF9zaXplLCBtdHIpOworCWJpdG1hcF9wYWdlID0gaWJ1Zl9iaXRtYXBfZ2V0X21hcF9wYWdlX2Z1
bmMoc3BhY2UsIHBhZ2Vfbm8sIHppcF9zaXplLAorCQkJCQkJICAgIGZpbGUsIGxpbmUsIG10cik7
CiAKIAlyZXQgPSBpYnVmX2JpdG1hcF9wYWdlX2dldF9iaXRzKGJpdG1hcF9wYWdlLCBwYWdlX25v
LCB6aXBfc2l6ZSwKIAkJCQkJSUJVRl9CSVRNQVBfSUJVRiwgbXRyKTsKCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvaWJ1ZjBpYnVmLmgnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9pYnVmMGlidWYuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDEwMTIwMTA4NDMzMy1jNWlsa3Jld3FibGZvcGc3CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9pYnVmMGlidWYuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIw
MTEzMDkwMi1xMGc1NHVmaWkwNm9yNG9lCkBAIC0yNDQsMTUgKzI0NCw0NCBAQCBNdXN0IG5vdCBi
ZSBjYWxsZWQgd2hlbiByZWN2X25vX2lidWZfb3BlCiBAcmV0dXJuCVRSVUUgaWYgbGV2ZWwgMiBv
ciBsZXZlbCAzIHBhZ2UgKi8KIFVOSVZfSU5URVJOCiBpYm9vbAotaWJ1Zl9wYWdlKAotLyo9PT09
PT0qLwotCXVsaW50CXNwYWNlLAkvKiE8IGluOiBzcGFjZSBpZCAqLwotCXVsaW50CXppcF9zaXpl
LC8qITwgaW46IGNvbXByZXNzZWQgcGFnZSBzaXplIGluIGJ5dGVzLCBvciAwICovCi0JdWxpbnQJ
cGFnZV9ubywvKiE8IGluOiBwYWdlIG51bWJlciAqLwotCW10cl90KgltdHIpOwkvKiE8IGluOiBt
dHIgd2hpY2ggd2lsbCBjb250YWluIGFuIHgtbGF0Y2ggdG8gdGhlCi0JCQliaXRtYXAgcGFnZSBp
ZiB0aGUgcGFnZSBpcyBub3Qgb25lIG9mIHRoZSBmaXhlZAotCQkJYWRkcmVzcyBpYnVmIHBhZ2Vz
LCBvciBOVUxMLCBpbiB3aGljaCBjYXNlIGEgbmV3Ci0JCQl0cmFuc2FjdGlvbiBpcyBjcmVhdGVk
LiAqLworaWJ1Zl9wYWdlX2xvdygKKy8qPT09PT09PT09PSovCisJdWxpbnQJCXNwYWNlLAkvKiE8
IGluOiBzcGFjZSBpZCAqLworCXVsaW50CQl6aXBfc2l6ZSwvKiE8IGluOiBjb21wcmVzc2VkIHBh
Z2Ugc2l6ZSBpbiBieXRlcywgb3IgMCAqLworCXVsaW50CQlwYWdlX25vLC8qITwgaW46IHBhZ2Ug
bnVtYmVyICovCisjaWZkZWYgVU5JVl9ERUJVRworCWlib29sCQl4X2xhdGNoLC8qITwgaW46IEZB
TFNFIGlmIHJlbGF4ZWQgY2hlY2sKKwkJCQkoYXZvaWQgbGF0Y2hpbmcgdGhlIGJpdG1hcCBwYWdl
KSAqLworI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KKwljb25zdCBjaGFyKglmaWxlLAkvKiE8IGlu
OiBmaWxlIG5hbWUgKi8KKwl1bGludAkJbGluZSwJLyohPCBpbjogbGluZSB3aGVyZSBjYWxsZWQg
Ki8KKwltdHJfdCoJCW10cikJLyohPCBpbjogbXRyIHdoaWNoIHdpbGwgY29udGFpbiBhbgorCQkJ
CXgtbGF0Y2ggdG8gdGhlIGJpdG1hcCBwYWdlIGlmIHRoZSBwYWdlCisJCQkJaXMgbm90IG9uZSBv
ZiB0aGUgZml4ZWQgYWRkcmVzcyBpYnVmCisJCQkJcGFnZXMsIG9yIE5VTEwsIGluIHdoaWNoIGNh
c2UgYSBuZXcKKwkJCQl0cmFuc2FjdGlvbiBpcyBjcmVhdGVkLiAqLworCV9fYXR0cmlidXRlX18o
KHdhcm5fdW51c2VkX3Jlc3VsdCkpOworI2lmZGVmIFVOSVZfREVCVUcKKy8qKiBDaGVja3MgaWYg
YSBwYWdlIGlzIGEgbGV2ZWwgMiBvciAzIHBhZ2UgaW4gdGhlIGlidWYgaGllcmFyY2h5IG9mCitw
YWdlcy4gIE11c3Qgbm90IGJlIGNhbGxlZCB3aGVuIHJlY3Zfbm9faWJ1Zl9vcGVyYXRpb25zPT1U
UlVFLgorQHBhcmFtIHNwYWNlCXRhYmxlc3BhY2UgaWRlbnRpZmllcgorQHBhcmFtIHppcF9zaXpl
CWNvbXByZXNzZWQgcGFnZSBzaXplIGluIGJ5dGVzLCBvciAwCitAcGFyYW0gcGFnZV9ubwlwYWdl
IG51bWJlcgorQHBhcmFtIG10cgltaW5pLXRyYW5zYWN0aW9uIG9yIE5VTEwKK0ByZXR1cm4gVFJV
RSBpZiBsZXZlbCAyIG9yIGxldmVsIDMgcGFnZSAqLworIyBkZWZpbmUgaWJ1Zl9wYWdlKHNwYWNl
LCB6aXBfc2l6ZSwgcGFnZV9ubywgbXRyKQkJCVwKKwlpYnVmX3BhZ2VfbG93KHNwYWNlLCB6aXBf
c2l6ZSwgcGFnZV9ubywgVFJVRSwgX19GSUxFX18sIF9fTElORV9fLCBtdHIpCisjZWxzZSAvKiBV
VklWX0RFQlVHICovCisvKiogQ2hlY2tzIGlmIGEgcGFnZSBpcyBhIGxldmVsIDIgb3IgMyBwYWdl
IGluIHRoZSBpYnVmIGhpZXJhcmNoeSBvZgorcGFnZXMuICBNdXN0IG5vdCBiZSBjYWxsZWQgd2hl
biByZWN2X25vX2lidWZfb3BlcmF0aW9ucz09VFJVRS4KK0BwYXJhbSBzcGFjZQl0YWJsZXNwYWNl
IGlkZW50aWZpZXIKK0BwYXJhbSB6aXBfc2l6ZQljb21wcmVzc2VkIHBhZ2Ugc2l6ZSBpbiBieXRl
cywgb3IgMAorQHBhcmFtIHBhZ2Vfbm8JcGFnZSBudW1iZXIKK0BwYXJhbSBtdHIJbWluaS10cmFu
c2FjdGlvbiBvciBOVUxMCitAcmV0dXJuIFRSVUUgaWYgbGV2ZWwgMiBvciBsZXZlbCAzIHBhZ2Ug
Ki8KKyMgZGVmaW5lIGlidWZfcGFnZShzcGFjZSwgemlwX3NpemUsIHBhZ2Vfbm8sIG10cikJCQlc
CisJaWJ1Zl9wYWdlX2xvdyhzcGFjZSwgemlwX3NpemUsIHBhZ2Vfbm8sIF9fRklMRV9fLCBfX0xJ
TkVfXywgbXRyKQorI2VuZGlmIC8qIFVWSVZfREVCVUcgKi8KIC8qKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioK
IEZyZWVzIGV4Y2VzcyBwYWdlcyBmcm9tIHRoZSBpYnVmIGZyZWUgbGlzdC4gVGhpcyBmdW5jdGlv
biBpcyBjYWxsZWQgd2hlbiBhbiBPUwogdGhyZWFkIGNhbGxzIGZzcCBzZXJ2aWNlcyB0byBhbGxv
Y2F0ZSBhIG5ldyBmaWxlIHNlZ21lbnQsIG9yIGEgbmV3IHBhZ2UgdG8gYQoK

--===============0475821227==
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: 5880e2b15bbcf2095338c7f86609470090fad565
# timestamp: 2010-12-01 15:09:13 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   c5ilkrewqblfopg7
# 
# Begin bundle
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


--===============0475821227==--