From: marko.makela
Date: May 4 2011 11:33am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3618 to 3619)
 Bug#12424846
List-Archive: http://lists.mysql.com/commits/136638
X-Bug: 12424846
Message-Id: <201105041133.p44BXPJg030315@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1656112821=="

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

IDM2MTkgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0wNAogICAgICBCdWcgIzEyNDI0ODQ2IE1VTFRJ
LVZFUlNJT05JTkcgVU5ORUNFU1NBUklMWSBIT0xESU5HIFBVUkdFX1NZUy0+TEFUQ0gKICAgICAg
CiAgICAgIE11bHRpLXZlcnNpb25pbmcgY29uY3VycmVuY3kgY29udHJvbCAoTVZDQykgY29kZSBh
Y3F1aXJlcwogICAgICBwdXJnZV9zeXMtPmxhdGNoIGluIFMgbW9kZS4gVGhpcyBhcHBlYXJzIHRv
IGJlIHVubmVjZXNzYXJ5LiBXaGVuIE1WQ0MKICAgICAgaXMgaG9sZGluZyB0aGUgY2x1c3RlcmVk
IGluZGV4IHBhZ2UgbGF0Y2gsIG90aGVyIHRyYW5zYWN0aW9ucyBvciBwdXJnZQogICAgICBjYW5u
b3QgbW9kaWZ5IHRoYXQgcGFnZS4gQSByb2xsaW5nIGJhY2sgdHJhbnNhY3Rpb24gY2Fubm90IHJl
bW92ZSBpdHMKICAgICAgdXBkYXRlX3VuZG8gbG9nIGJlZm9yZSB1bmRvaW5nIGFsbCBjaGFuZ2Vz
LiBBIGNvbW1pdHRpbmcgdHJhbnNhY3Rpb24KICAgICAgd2lsbCBub3QgcmVtb3ZlIGl0cyB1cGRh
dGVfdW5kbyBsb2cgKHB1cmdlIHdpbGwpLiBQdXJnZSBjYW5ub3QgcmVtb3ZlCiAgICAgIHRoZSB1
cGRhdGVfdW5kbyBsb2cgaWYgdGhlcmUgYXJlIHRyYW5zYWN0aW9ucyB0aGF0IGNvdWxkIHNlZSB0
aGUKICAgICAgY2hhbmdlcyBjb3ZlcmVkIGJ5IGl0LiBNVkNDIHN0b3BzIHdoZW4gcmVhY2hpbmcg
dGhlIG9sZGVzdCB2ZXJzaW9uCiAgICAgIHRoYXQgaXQgaXMgYWxsb3dlZCB0byBzZWUuIFRodXMs
IHRoZXJlIGlzIG5vIHJvb20gZm9yIGNvbGxpc2lvbgogICAgICBiZXR3ZWVuIE1WQ0MgYW5kIGFj
dGl2ZSB0cmFuc2FjdGlvbnMgb3IgcHVyZ2UuCiAgICAgIAogICAgICB0cnhfdW5kb19wcmV2X3Zl
cnNpb25fYnVpbGQoKTogQXNzZXJ0IHRoYXQgdGhlIHB1cmdlX3N5cy0+bGF0Y2ggaXMgbm90CiAg
ICAgIGJlaW5nIGhlbGQgYnkgdGhlIGNhbGxlci4gVGhpcyBpcyBleGFjdGx5IHRoZSBvcHBvc2l0
ZSBmcm9tIGJlZm9yZS4KICAgICAgCiAgICAgIHRyeF91bmRvX2dldF91bmRvX3JlYygpOiBTaG9y
dGx5IGFjcXVpcmUgdGhlIHB1cmdlX3N5cy0+bGF0Y2ggZm9yCiAgICAgIGNoZWNraW5nIHRoZSBw
dXJnZV9zeXMtPnZpZXcuCiAgICAgIAogICAgICB0cnhfcHVyZ2VfdXBkYXRlX3VuZG9fbXVzdF9l
eGlzdCgpOiBSZXBsYWNlZCB3aXRoIGlubGluZSBjYWxscyB0bwogICAgICAhcmVhZF92aWV3X3Nl
ZXNfdHJ4X2lkKCkuCiAgICAgIAogICAgICByb3dfdmVyc19vbGRfaGFzX2luZGV4X2VudHJ5KCks
IHJvd192ZXJzX2J1aWxkX2Zvcl9jb25zaXN0ZW50X3JlYWQoKSwKICAgICAgcm93X3ZlcnNfYnVp
bGRfZm9yX3NlbWlfY29uc2lzdGVudF9yZWFkKCk6IE5vIGxvbmdlciBhY3F1aXJlCiAgICAgIHB1
cmdlX3N5cy0+bGF0Y2guCiAgICAgIAogICAgICBUaGUgcHVyZ2Vfc3lzLT5sYXRjaCBzZWVtcyB0
byBiZSBuZWNlc3NhcnkgaW4gc29tZSBjYXNlcywgYW5kIGJlY2F1c2UKICAgICAgUy1sb2NrZXJz
IHJlbWFpbiwgaXQgY2Fubm90IGJlIHR1cm5lZCBpbnRvIGEgbXV0ZXguCiAgICAgIAogICAgICBy
Yjo2NTQgYXBwcm92ZWQgYnkgU3VubnkgQmFpbnMKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDBwdXJnZS5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS90cngwcmVjLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHZlcnMuYwogICAg
ICBzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcHVyZ2UuYwogICAgICBzdG9yYWdlL2lubm9iYXNl
L3RyeC90cngwcmVjLmMKIDM2MTggSmltbXkgWWFuZwkyMDExLTA1LTA0IFttZXJnZV0KICAgICAg
TWVyZ2UgZnJvbSBteXNxbC01LjUtaW5ub2RiIHRvIG15c3FsLXRydW5rLWlubm9kYgoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL29zL29zMGZpbGUuYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDBwdXJnZS5oJwotLS0gYS9zdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvdHJ4MHB1cmdlLmgJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29t
LTIwMTEwNTA0MDcyOTUxLTZocHFyYWRqZG4wcjM5d3cKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9p
bmNsdWRlL3RyeDBwdXJnZS5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTA0
MTEyOTI5LTN6cWhweTI5bmx5bDBzYzAKQEAgLTUyLDE3ICs1Miw2IEBAIHRyeF9wdXJnZV9nZXRf
bG9nX2Zyb21faGlzdCgKIC8qPT09PT09PT09PT09PT09PT09PT09PT09Ki8KIAlmaWxfYWRkcl90
CW5vZGVfYWRkcik7CS8qITwgaW46IGZpbGUgYWRkcmVzcyBvZiB0aGUgaGlzdG9yeQogCQkJCQls
aXN0IG5vZGUgb2YgdGhlIGxvZyAqLwotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotQ2hlY2tzIGlmIHRyeF9pZCBp
cyA+PSBwdXJnZV92aWV3OiB0aGVuIGl0IGlzIGd1YXJhbnRlZWQgdGhhdCBpdHMgdXBkYXRlCi11
bmRvIGxvZyBzdGlsbCBleGlzdHMgaW4gdGhlIHN5c3RlbS4KLUByZXR1cm4gVFJVRSBpZiBpcyBz
dXJlIHRoYXQgaXQgaXMgcHJlc2VydmVkLCBhbHNvIGlmIHRoZSBmdW5jdGlvbgotcmV0dXJucyBG
QUxTRSwgaXQgaXMgcG9zc2libGUgdGhhdCB0aGUgdW5kbyBsb2cgc3RpbGwgZXhpc3RzIGluIHRo
ZQotc3lzdGVtICovCi1VTklWX0lOVEVSTgotaWJvb2wKLXRyeF9wdXJnZV91cGRhdGVfdW5kb19t
dXN0X2V4aXN0KAotLyo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCi0JdHJ4X2lkX3QJ
dHJ4X2lkKTsvKiE8IGluOiB0cmFuc2FjdGlvbiBpZCAqLwogLyoqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogQ3Jl
YXRlcyB0aGUgZ2xvYmFsIHB1cmdlIHN5c3RlbSBjb250cm9sIHN0cnVjdHVyZSBhbmQgaW5pdHMg
dGhlIGhpc3RvcnkKIG11dGV4LiAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS90cngwcmVjLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngw
cmVjLmgJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTEwNTA0MDcyOTUxLTZocHFyYWRq
ZG4wcjM5d3cKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDByZWMuaAlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUwNDExMjkyOS0zenFocHkyOW5seWwwc2MwCkBA
IC0yNDAsMTAgKzI0MCwxMCBAQCB0cnhfdW5kb19nZXRfdW5kb19yZWNfbG93KAogCXJvbGxfcHRy
X3QJcm9sbF9wdHIsCS8qITwgaW46IHJvbGwgcG9pbnRlciB0byByZWNvcmQgKi8KIAltZW1faGVh
cF90KgloZWFwKTsJCS8qITwgaW46IG1lbW9yeSBoZWFwIHdoZXJlIGNvcGllZCAqLwogLyoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKiovLyoqCi1CdWlsZCBhIHByZXZpb3VzIHZlcnNpb24gb2YgYSBjbHVzdGVyZWQgaW5kZXgg
cmVjb3JkLiBUaGlzIGZ1bmN0aW9uIGNoZWNrcwotdGhhdCB0aGUgY2FsbGVyIGhhcyBhIGxhdGNo
IG9uIHRoZSBpbmRleCBwYWdlIG9mIHRoZSBjbHVzdGVyZWQgaW5kZXggcmVjb3JkCi1hbmQgYW4g
cy1sYXRjaCBvbiB0aGUgcHVyZ2Vfdmlldy4gVGhpcyBndWFyYW50ZWVzIHRoYXQgdGhlIHN0YWNr
IG9mIHZlcnNpb25zCi1pcyBsb2NrZWQuCitCdWlsZCBhIHByZXZpb3VzIHZlcnNpb24gb2YgYSBj
bHVzdGVyZWQgaW5kZXggcmVjb3JkLiBUaGUgY2FsbGVyIG11c3QKK2hvbGQgYSBsYXRjaCBvbiB0
aGUgaW5kZXggcGFnZSBvZiB0aGUgY2x1c3RlcmVkIGluZGV4IHJlY29yZCwgdG8KK2d1YXJhbnRl
ZSB0aGF0IHRoZSBzdGFjayBvZiB2ZXJzaW9ucyBpcyBsb2NrZWQgYWxsIHRoZSB3YXkgZG93biB0
byB0aGUKK3B1cmdlX3N5cy0+dmlldy4KIEByZXR1cm4gREJfU1VDQ0VTUywgb3IgREJfTUlTU0lO
R19ISVNUT1JZIGlmIHRoZSBwcmV2aW91cyB2ZXJzaW9uIGlzCiBlYXJsaWVyIHRoYW4gcHVyZ2Vf
dmlldywgd2hpY2ggbWVhbnMgdGhhdCBpdCBtYXkgaGF2ZSBiZWVuIHJlbW92ZWQgKi8KIFVOSVZf
SU5URVJOCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHZlcnMu
YycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHZlcnMuYwlyZXZpZDpqaW1teS55YW5n
QG9yYWNsZS5jb20tMjAxMTA1MDQwNzI5NTEtNmhwcXJhZGpkbjByMzl3dworKysgYi9zdG9yYWdl
L2lubm9iYXNlL3Jvdy9yb3cwdmVycy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTEwNTA0MTEyOTI5LTN6cWhweTI5bmx5bDBzYzAKQEAgLTExMyw4ICsxMTMsNiBAQCByb3dfdmVy
c19pbXBsX3hfbG9ja2VkX2xvdygKIAltb2RpZnkgcmVjLCBhbmQgZG9lcyBub3QgbmVjZXNzYXJp
bHkgaGF2ZSBhbiBpbXBsaWNpdCB4LWxvY2sKIAlvbiByZWMuICovCiAKLQltdHJfc19sb2NrKCZw
dXJnZV9zeXMtPmxhdGNoLCBtdHIpOwotCiAJZm9yICh2ZXJzaW9uID0gY2x1c3RfcmVjOzsgdmVy
c2lvbiA9IHByZXZfdmVyc2lvbikgewogCQl1bGludAkJZXJyOwogCQlyb3dfZXh0X3QqCWV4dDsK
QEAgLTE4OSw5ICsxODcsOSBAQCByb3dfdmVyc19pbXBsX3hfbG9ja2VkX2xvdygKIAkJd291bGQg
cmVxdWlyZSByZWMgdG8gYmUgaW4gYSBkaWZmZXJlbnQgc3RhdGUuICovCiAKIAkJLyogVGhlIHBy
ZXZpb3VzIHZlcnNpb24gb2YgY2x1c3RfcmVjIG11c3QgYmUKLQkJYWNjZXNzaWJsZSwgYmVjYXVz
ZSBjbHVzdF9yZWMgd2FzIG5vdCBhIGZyZXNoIGluc2VydAotCQlhbmQgd2UgYXJlIGhvbGRpbmcg
cHVyZ2Vfc3lzLT5sYXRjaC4gVGhlcmUgaXMgbm8KLQkJZ3VhcmFudGVlIHRoYXQgdGhlIHRyYW5z
YWN0aW9uIGlzIHN0aWxsIGFjdGl2ZS4gKi8KKwkJYWNjZXNzaWJsZSwgYmVjYXVzZSBjbHVzdF9y
ZWMgd2FzIG5vdCBhIGZyZXNoIGluc2VydC4KKwkJVGhlcmUgaXMgbm8gZ3VhcmFudGVlIHRoYXQg
dGhlIHRyYW5zYWN0aW9uIGlzIHN0aWxsCisJCWFjdGl2ZS4gKi8KIAogCQl1dF9hZChlcnIgPT0g
REJfU1VDQ0VTUyk7CiAKQEAgLTI4NSw4ICsyODMsMTAgQEAgcm93X3ZlcnNfaW1wbF94X2xvY2tl
ZCgKIAogCS8qIFNlYXJjaCBmb3IgdGhlIGNsdXN0ZXJlZCBpbmRleCByZWNvcmQuIFRoZSBsYXRj
aCBvbiB0aGUKIAlwYWdlIG9mIGNsdXN0X3JlYyBsb2NrcyB0aGUgdG9wIG9mIHRoZSBzdGFjayBv
ZiB2ZXJzaW9ucy4gVGhlCi0JYm90dG9tIG9mIHRoZSB2ZXJzaW9uIHN0YWNrIHdpbGwgYmUgbG9j
a2VkIGJ5Ci0JcHVyZ2Vfc3lzLT5sYXRjaC4gKi8KKwlib3R0b20gb2YgdGhlIHZlcnNpb24gc3Rh
Y2sgaXMgbm90IGxvY2tlZDsgb2xkZXN0IHZlcnNpb25zIG1heQorCWRpc2FwcGVhciBieSB0aGUg
ZmFjdCB0aGF0IHRyYW5zYWN0aW9ucyBtYXkgYmUgY29tbWl0dGVkIGFuZAorCWNvbGxlY3RlZCBi
eSB0aGUgcHVyZ2UuIFRoaXMgaXMgbm90IGEgcHJvYmxlbSwgYmVjYXVzZSB3ZSBhcmUKKwlvbmx5
IGludGVyZXN0ZWQgaW4gYWN0aXZlIHRyYW5zYWN0aW9ucy4gKi8KIAogCWNsdXN0X3JlYyA9IHJv
d19nZXRfY2x1c3RfcmVjKAogCQlCVFJfU0VBUkNIX0xFQUYsIHJlYywgaW5kZXgsICZjbHVzdF9p
bmRleCwgJm10cik7CkBAIC0zMzQsMTUgKzMzNCw3IEBAIHJvd192ZXJzX211c3RfcHJlc2VydmVf
ZGVsX21hcmtlZCgKIAogCW10cl9zX2xvY2soJihwdXJnZV9zeXMtPmxhdGNoKSwgbXRyKTsKIAot
CWlmICh0cnhfcHVyZ2VfdXBkYXRlX3VuZG9fbXVzdF9leGlzdCh0cnhfaWQpKSB7Ci0KLQkJLyog
QSBwdXJnZSBvcGVyYXRpb24gaXMgbm90IHlldCBhbGxvd2VkIHRvIHJlbW92ZSB0aGlzCi0JCWRl
bGV0ZSBtYXJrZWQgcmVjb3JkICovCi0KLQkJcmV0dXJuKFRSVUUpOwotCX0KLQotCXJldHVybihG
QUxTRSk7CisJcmV0dXJuKCFyZWFkX3ZpZXdfc2Vlc190cnhfaWQocHVyZ2Vfc3lzLT52aWV3LCB0
cnhfaWQpKTsKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqLy8qKgpAQCAtMzgyLDcgKzM3NCw2IEBAIHJvd192ZXJz
X29sZF9oYXNfaW5kZXhfZW50cnkoCiAjaWZkZWYgVU5JVl9TWU5DX0RFQlVHCiAJdXRfYWQoIXJ3
X2xvY2tfb3duKCYocHVyZ2Vfc3lzLT5sYXRjaCksIFJXX0xPQ0tfU0hBUkVEKSk7CiAjZW5kaWYg
LyogVU5JVl9TWU5DX0RFQlVHICovCi0JbXRyX3NfbG9jaygmKHB1cmdlX3N5cy0+bGF0Y2gpLCBt
dHIpOwogCiAJY2x1c3RfaW5kZXggPSBkaWN0X3RhYmxlX2dldF9maXJzdF9pbmRleChpbmRleC0+
dGFibGUpOwogCkBAIC0zOTUsNyArMzg2LDExIEBAIHJvd192ZXJzX29sZF9oYXNfaW5kZXhfZW50
cnkoCiAJaWYgKGFsc29fY3VyciAmJiAhcmVjX2dldF9kZWxldGVkX2ZsYWcocmVjLCBjb21wKSkg
ewogCQlyb3dfZXh0X3QqCWV4dDsKIAotCQkvKiBUaGUgc3RhY2sgb2YgdmVyc2lvbnMgaXMgbG9j
a2VkIGJ5IG10ci4KKwkJLyogVGhlIHRvcCBvZiB0aGUgc3RhY2sgb2YgdmVyc2lvbnMgaXMgbG9j
a2VkIGJ5IHRoZQorCQltdHIgaG9sZGluZyBhIGxhdGNoIG9uIHRoZSBwYWdlIGNvbnRhaW5pbmcg
dGhlCisJCWNsdXN0ZXJlZCBpbmRleCByZWNvcmQuIFRoZSBib3R0b20gb2YgdGhlIHN0YWNrIGlz
CisJCWxvY2tlZCBieSB0aGUgZmFjdCB0aGF0IHRoZSBwdXJnZV9zeXMtPnZpZXcgbXVzdAorCQkn
b3ZlcnRha2UnIGFueSByZWFkIHZpZXcgb2YgYW4gYWN0aXZlIHRyYW5zYWN0aW9uLgogCQlUaHVz
LCBpdCBpcyBzYWZlIHRvIGZldGNoIHRoZSBwcmVmaXhlcyBmb3IKIAkJZXh0ZXJuYWxseSBzdG9y
ZWQgY29sdW1ucy4gKi8KIAkJcm93ID0gcm93X2J1aWxkKFJPV19DT1BZX1BPSU5URVJTLCBjbHVz
dF9pbmRleCwKQEAgLTUzNSw3ICs1MzAsNiBAQCByb3dfdmVyc19idWlsZF9mb3JfY29uc2lzdGVu
dF9yZWFkKAogCiAJdXRfYWQoIXJlYWRfdmlld19zZWVzX3RyeF9pZCh2aWV3LCB0cnhfaWQpKTsK
IAotCXJ3X2xvY2tfc19sb2NrKCYocHVyZ2Vfc3lzLT5sYXRjaCkpOwogCXZlcnNpb24gPSByZWM7
CiAKIAlmb3IgKDs7KSB7CkBAIC02MTUsNyArNjA5LDYgQEAgcm93X3ZlcnNfYnVpbGRfZm9yX2Nv
bnNpc3RlbnRfcmVhZCgKIAl9LyogZm9yICg7OykgKi8KIAogCW1lbV9oZWFwX2ZyZWUoaGVhcCk7
Ci0JcndfbG9ja19zX3VubG9jaygmKHB1cmdlX3N5cy0+bGF0Y2gpKTsKIAogCXJldHVybihlcnIp
OwogfQpAQCAtNjYxLDEyICs2NTQsNiBAQCByb3dfdmVyc19idWlsZF9mb3Jfc2VtaV9jb25zaXN0
ZW50X3JlYWQoCiAKIAl1dF9hZChyZWNfb2Zmc192YWxpZGF0ZShyZWMsIGluZGV4LCAqb2Zmc2V0
cykpOwogCi0JcndfbG9ja19zX2xvY2soJihwdXJnZV9zeXMtPmxhdGNoKSk7Ci0JLyogVGhlIFMt
bGF0Y2ggb24gcHVyZ2Vfc3lzIHByZXZlbnRzIHRoZSBwdXJnZSB2aWV3IGZyb20KLQljaGFuZ2lu
Zy4gIFRodXMsIGlmIHdlIGhhdmUgYW4gdW5jb21taXR0ZWQgdHJhbnNhY3Rpb24gYXQKLQl0aGlz
IHBvaW50LCB0aGVuIHB1cmdlIGNhbm5vdCByZW1vdmUgaXRzIHVuZG8gbG9nIGV2ZW4gaWYKLQl0
aGUgdHJhbnNhY3Rpb24gY291bGQgY29tbWl0IG5vdy4gKi8KLQogCXZlcnNpb24gPSByZWM7CiAK
IAlmb3IgKDs7KSB7CkBAIC03NTksNyArNzQ2LDYgQEAgcm93X3ZlcnNfYnVpbGRfZm9yX3NlbWlf
Y29uc2lzdGVudF9yZWFkKAogCWlmIChoZWFwKSB7CiAJCW1lbV9oZWFwX2ZyZWUoaGVhcCk7CiAJ
fQotCXJ3X2xvY2tfc191bmxvY2soJihwdXJnZV9zeXMtPmxhdGNoKSk7CiAKIAlyZXR1cm4oZXJy
KTsKIH0KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcHVyZ2Uu
YycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHB1cmdlLmMJcmV2aWQ6amltbXkueWFu
Z0BvcmFjbGUuY29tLTIwMTEwNTA0MDcyOTUxLTZocHFyYWRqZG4wcjM5d3cKKysrIGIvc3RvcmFn
ZS9pbm5vYmFzZS90cngvdHJ4MHB1cmdlLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMTA1MDQxMTI5MjktM3pxaHB5MjlubHlsMHNjMApAQCAtODAsMjUgKzgwLDYgQEAgdHJ4X3B1
cmdlX2ZldGNoX25leHRfcmVjKAogCQkJCQloYW5kbGVkICovCiAJbWVtX2hlYXBfdCoJaGVhcCk7
CQkvKiE8IGluOiBtZW1vcnkgaGVhcCB3aGVyZSBjb3BpZWQgKi8KIAotLyoqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgot
Q2hlY2tzIGlmIHRyeF9pZCBpcyA+PSBwdXJnZV92aWV3OiB0aGVuIGl0IGlzIGd1YXJhbnRlZWQg
dGhhdCBpdHMgdXBkYXRlCi11bmRvIGxvZyBzdGlsbCBleGlzdHMgaW4gdGhlIHN5c3RlbS4KLUBy
ZXR1cm4gVFJVRSBpZiBpcyBzdXJlIHRoYXQgaXQgaXMgcHJlc2VydmVkLCBhbHNvIGlmIHRoZSBm
dW5jdGlvbgotcmV0dXJucyBGQUxTRSwgaXQgaXMgcG9zc2libGUgdGhhdCB0aGUgdW5kbyBsb2cg
c3RpbGwgZXhpc3RzIGluIHRoZQotc3lzdGVtICovCi1VTklWX0lOVEVSTgotaWJvb2wKLXRyeF9w
dXJnZV91cGRhdGVfdW5kb19tdXN0X2V4aXN0KAotLyo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PSovCi0JdHJ4X2lkX3QJdHJ4X2lkKQkvKiE8IGluOiB0cmFuc2FjdGlvbiBpZCAqLwotewot
I2lmZGVmIFVOSVZfU1lOQ19ERUJVRwotCXV0X2FkKHJ3X2xvY2tfb3duKCYocHVyZ2Vfc3lzLT5s
YXRjaCksIFJXX0xPQ0tfU0hBUkVEKSk7Ci0jZW5kaWYgLyogVU5JVl9TWU5DX0RFQlVHICovCi0K
LQlyZXR1cm4oIXJlYWRfdmlld19zZWVzX3RyeF9pZChwdXJnZV9zeXMtPnZpZXcsIHRyeF9pZCkp
OwotfQotCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKi8vKioKIEJ1aWxkcyBhIHB1cmdlICdxdWVyeScgZ3JhcGguIFRoZSBh
Y3R1YWwgcHVyZ2UgaXMgcGVyZm9ybWVkIGJ5IGV4ZWN1dGluZwogdGhpcyBxdWVyeSBncmFwaC4K
Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwcmVjLmMnCi0tLSBh
L3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDByZWMuYwlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5j
b20tMjAxMTA1MDQwNzI5NTEtNmhwcXJhZGpkbjByMzl3dworKysgYi9zdG9yYWdlL2lubm9iYXNl
L3RyeC90cngwcmVjLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MDQxMTI5
MjktM3pxaHB5MjlubHlsMHNjMApAQCAtMzYsNiArMzYsNyBAQCBDcmVhdGVkIDMvMjYvMTk5NiBI
ZWlra2kgVHV1cmkKICNpZm5kZWYgVU5JVl9IT1RCQUNLVVAKICNpbmNsdWRlICJkaWN0MGRpY3Qu
aCIKICNpbmNsdWRlICJ1dDBtZW0uaCIKKyNpbmNsdWRlICJyZWFkMHJlYWQuaCIKICNpbmNsdWRl
ICJyb3cwZXh0LmgiCiAjaW5jbHVkZSAicm93MHVwZC5oIgogI2luY2x1ZGUgInF1ZTBxdWUuaCIK
QEAgLTEzODMsMTEgKzEzODQsMTMgQEAgdHJ4X3VuZG9fZ2V0X3VuZG9fcmVjKAogCXRyeF91bmRv
X3JlY190KiogdW5kb19yZWMsCS8qITwgb3V0LCBvd246IGNvcHkgb2YgdGhlIHJlY29yZCAqLwog
CW1lbV9oZWFwX3QqCWhlYXApCQkvKiE8IGluOiBtZW1vcnkgaGVhcCB3aGVyZSBjb3BpZWQgKi8K
IHsKLSNpZmRlZiBVTklWX1NZTkNfREVCVUcKLQl1dF9hZChyd19sb2NrX293bigmKHB1cmdlX3N5
cy0+bGF0Y2gpLCBSV19MT0NLX1NIQVJFRCkpOwotI2VuZGlmIC8qIFVOSVZfU1lOQ19ERUJVRyAq
LworCWlib29sCQltaXNzaW5nX2hpc3Rvcnk7CisKKwlyd19sb2NrX3NfbG9jaygmcHVyZ2Vfc3lz
LT5sYXRjaCk7CisJbWlzc2luZ19oaXN0b3J5ID0gcmVhZF92aWV3X3NlZXNfdHJ4X2lkKHB1cmdl
X3N5cy0+dmlldywgdHJ4X2lkKTsKKwlyd19sb2NrX3NfdW5sb2NrKCZwdXJnZV9zeXMtPmxhdGNo
KTsKIAotCWlmICghdHJ4X3B1cmdlX3VwZGF0ZV91bmRvX211c3RfZXhpc3QodHJ4X2lkKSkgewor
CWlmIChVTklWX1VOTElLRUxZKG1pc3NpbmdfaGlzdG9yeSkpIHsKIAogCQkvKiBJdCBtYXkgYmUg
dGhhdCB0aGUgbmVjZXNzYXJ5IHVuZG8gbG9nIGhhcyBhbHJlYWR5IGJlZW4KIAkJZGVsZXRlZCAq
LwpAQCAtMTQwNywxMCArMTQxMCwxMCBAQCB0cnhfdW5kb19nZXRfdW5kb19yZWMoCiAjZW5kaWYg
LyogVU5JVl9ERUJVRyAqLwogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLUJ1aWxkIGEgcHJldmlvdXMgdmVy
c2lvbiBvZiBhIGNsdXN0ZXJlZCBpbmRleCByZWNvcmQuIFRoaXMgZnVuY3Rpb24gY2hlY2tzCi10
aGF0IHRoZSBjYWxsZXIgaGFzIGEgbGF0Y2ggb24gdGhlIGluZGV4IHBhZ2Ugb2YgdGhlIGNsdXN0
ZXJlZCBpbmRleCByZWNvcmQKLWFuZCBhbiBzLWxhdGNoIG9uIHRoZSBwdXJnZV92aWV3LiBUaGlz
IGd1YXJhbnRlZXMgdGhhdCB0aGUgc3RhY2sgb2YgdmVyc2lvbnMKLWlzIGxvY2tlZCBhbGwgdGhl
IHdheSBkb3duIHRvIHRoZSBwdXJnZV92aWV3LgorQnVpbGQgYSBwcmV2aW91cyB2ZXJzaW9uIG9m
IGEgY2x1c3RlcmVkIGluZGV4IHJlY29yZC4gVGhlIGNhbGxlciBtdXN0Citob2xkIGEgbGF0Y2gg
b24gdGhlIGluZGV4IHBhZ2Ugb2YgdGhlIGNsdXN0ZXJlZCBpbmRleCByZWNvcmQsIHRvCitndWFy
YW50ZWUgdGhhdCB0aGUgc3RhY2sgb2YgdmVyc2lvbnMgaXMgbG9ja2VkIGFsbCB0aGUgd2F5IGRv
d24gdG8gdGhlCitwdXJnZV9zeXMtPnZpZXcuCiBAcmV0dXJuIERCX1NVQ0NFU1MsIG9yIERCX01J
U1NJTkdfSElTVE9SWSBpZiB0aGUgcHJldmlvdXMgdmVyc2lvbiBpcwogZWFybGllciB0aGFuIHB1
cmdlX3ZpZXcsIHdoaWNoIG1lYW5zIHRoYXQgaXQgbWF5IGhhdmUgYmVlbiByZW1vdmVkICovCiBV
TklWX0lOVEVSTgpAQCAtMTQ1MSw3ICsxNDU0LDcgQEAgdHJ4X3VuZG9fcHJldl92ZXJzaW9uX2J1
aWxkKAogCWJ5dGUqCQlidWY7CiAJdWxpbnQJCWVycjsKICNpZmRlZiBVTklWX1NZTkNfREVCVUcK
LQl1dF9hZChyd19sb2NrX293bigmKHB1cmdlX3N5cy0+bGF0Y2gpLCBSV19MT0NLX1NIQVJFRCkp
OworCXV0X2FkKCFyd19sb2NrX293bigmcHVyZ2Vfc3lzLT5sYXRjaCwgUldfTE9DS19TSEFSRUQp
KTsKICNlbmRpZiAvKiBVTklWX1NZTkNfREVCVUcgKi8KIAl1dF9hZChtdHJfbWVtb19jb250YWlu
c19wYWdlKGluZGV4X210ciwgaW5kZXhfcmVjLCBNVFJfTUVNT19QQUdFX1NfRklYKQogCSAgICAg
IHx8IG10cl9tZW1vX2NvbnRhaW5zX3BhZ2UoaW5kZXhfbXRyLCBpbmRleF9yZWMsCgo=

--===============1656112821==
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: 672733c5a7ec6204b7bde4bc93a7138107c10361
# timestamp: 2011-05-04 14:33:20 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: jimmy.yang@stripped\
#   6hpqradjdn0r39ww
# 
# Begin bundle
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


--===============1656112821==--