From: marko.makela
Date: April 6 2011 11:08am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3566 to 3567)
List-Archive: http://lists.mysql.com/commits/134799
Message-Id: <201104061108.p36B8PD0017094@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1879105234=="

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

IDM1NjcgTWFya28gTcOka2Vsw6QJMjAxMS0wNC0wNgogICAgICBSZW1vdmUgdW51c2VkIExPR19D
SEVDS1BPSU5UX0ZTUF9GUkVFX0xJTUlUIGFuZCB1c2VsZXNzIGNoZWNrcG9pbnRpbmcKICAgICAg
dGhhdCB3YXMgYWRkZWQgaW4gTXlTUUwgMy4yMy41MC4KICAgICAgCiAgICAgIEFjY29yZGluZyB0
byBIZWlra2kgVHV1cmksIHRoZSBmaWVsZCBMT0dfQ0hFQ0tQT0lOVF9GU1BfRlJFRV9MSU1JVCBt
YXkKICAgICAgaGF2ZSBiZWVuIHVzZWQgaW4gb3JkZXIgdG8gc2hvcnRlbiBiYWNrdXAgZmlsZXMg
YmVmb3JlIFpsaWIKICAgICAgY29tcHJlc3Npb24gKGliYmFja3VwIC0tY29tcHJlc3MpIHdhcyBp
bXBsZW1lbnRlZCBpbiBJbm5vREIgSG90IEJhY2t1cAogICAgICAobm93IGtub3duIGFzIE15U1FM
IEVudGVycHJpc2UgQmFja3VwKS4KICAgICAgCiAgICAgIHJlY3ZfcmVhZF9jaGVja3BvaW50X2lu
Zm9fZm9yX2JhY2t1cCgpOiBSZW5hbWUgZnJvbQogICAgICByZWN2X3JlYWRfY3BfaW5mb19mb3Jf
YmFja3VwKCkgYW5kIHJlbW92ZSB0aGUgdW51c2VkIG91dHB1dCBwYXJhbWV0ZXIKICAgICAgZnNw
X2xpbWl0LgogICAgICAKICAgICAgbG9nX2ZzcF9jdXJyZW50X2ZyZWVfbGltaXRfc2V0X2FuZF9j
aGVja3BvaW50KCk6IFJlbW92ZS4KICAgICAgCiAgICAgIGxvZ19mc3BfY3VycmVudF9mcmVlX2xp
bWl0OiBSZW1vdmUuCiAgICAgIAogICAgICBMT0dfQ0hFQ0tQT0lOVF9GU1BfRlJFRV9MSU1JVCwg
TE9HX0NIRUNLUE9JTlRfRlNQX01BR0lDX04sCiAgICAgIExPR19DSEVDS1BPSU5UX0ZTUF9NQUdJ
Q19OX1ZBTDogUmVtb3ZlLgogICAgICAKICAgICAgZnNwX2hlYWRlcl9nZXRfZnJlZV9saW1pdCgp
OiBSZW1vdmUuCiAgICAgIAogICAgICBmc3BfZmlsbF9mcmVlX2xpc3QoKTogTm8gbG9uZ2VyIG1h
a2UgYSByZWRvIGxvZyBjaGVja3BvaW50LgogICAgICBQcmV2aW91c2x5LCB3ZSBkaWQgdGhhdCB3
aGVuIGV4dGVuZGluZyB0aGUgc3lzdGVtIHRhYmxlc3BhY2UgKHNwYWNlIDApLgogICAgICAKICAg
ICAgcmI6NjQzIGFwcHJvdmVkIGJ5IEppbW15IFlhbmcKCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9mc3AvZnNwMGZzcC5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9mc3AwZnNwLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2xvZzBsb2cuaAogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2xvZy9sb2cwbG9nLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9s
b2cvbG9nMHJlY3YuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuYwogMzU2
NiBNYXJrbyBNw6RrZWzDpAkyMDExLTA0LTA2IFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwtNS41
LWlubm9kYiB0byBteXNxbC10cnVuay1pbm5vZGIuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2UvbG9nL2xvZzBsb2cuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYw
c3RhcnQuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9mc3AvZnNwMGZzcC5j
JwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2ZzcC9mc3AwZnNwLmMJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMTA0MDYwNzM3MTAtdW80YzBiM2FvNmtmODNhaAorKysgYi9zdG9yYWdl
L2lubm9iYXNlL2ZzcC9mc3AwZnNwLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MTA0MDYxMTA3NDQtY2Z1b2IzbGZkcDhidTZtbwpAQCAtMTA5NywzOCArMTA5Nyw2IEBAIGZzcF9o
ZWFkZXJfaW5jX3NpemUoCiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotR2V0cyB0aGUgY3VycmVu
dCBmcmVlIGxpbWl0IG9mIHRoZSBzeXN0ZW0gdGFibGVzcGFjZS4gIFRoZSBmcmVlIGxpbWl0Ci1t
ZWFucyB0aGUgcGxhY2Ugb2YgdGhlIGZpcnN0IHBhZ2Ugd2hpY2ggaGFzIG5ldmVyIGJlZW4gcHV0
IHRvIHRoZQotZnJlZSBsaXN0IGZvciBhbGxvY2F0aW9uLiAgVGhlIHNwYWNlIGFib3ZlIHRoYXQg
YWRkcmVzcyBpcyBpbml0aWFsaXplZAotdG8gemVyby4gIFNldHMgYWxzbyB0aGUgZ2xvYmFsIHZh
cmlhYmxlIGxvZ19mc3BfY3VycmVudF9mcmVlX2xpbWl0LgotQHJldHVybglmcmVlIGxpbWl0IGlu
IG1lZ2FieXRlcyAqLwotVU5JVl9JTlRFUk4KLXVsaW50Ci1mc3BfaGVhZGVyX2dldF9mcmVlX2xp
bWl0KHZvaWQpCi0vKj09PT09PT09PT09PT09PT09PT09PT09PT09PSovCi17Ci0JZnNwX2hlYWRl
cl90KgloZWFkZXI7Ci0JdWxpbnQJCWxpbWl0OwotCW10cl90CQltdHI7Ci0KLQltdHJfc3RhcnQo
Jm10cik7Ci0KLQltdHJfeF9sb2NrKGZpbF9zcGFjZV9nZXRfbGF0Y2goMCwgTlVMTCksICZtdHIp
OwotCi0JaGVhZGVyID0gZnNwX2dldF9zcGFjZV9oZWFkZXIoMCwgMCwgJm10cik7Ci0KLQlsaW1p
dCA9IG10cl9yZWFkX3VsaW50KGhlYWRlciArIEZTUF9GUkVFX0xJTUlULCBNTE9HXzRCWVRFUywg
Jm10cik7Ci0KLQlsaW1pdCAvPSAoKDEwMjQgKiAxMDI0KSAvIFVOSVZfUEFHRV9TSVpFKTsKLQot
CWxvZ19mc3BfY3VycmVudF9mcmVlX2xpbWl0X3NldF9hbmRfY2hlY2twb2ludChsaW1pdCk7Ci0K
LQltdHJfY29tbWl0KCZtdHIpOwotCi0JcmV0dXJuKGxpbWl0KTsKLX0KLQotLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KiovLyoqCiBHZXRzIHRoZSBzaXplIG9mIHRoZSBzeXN0ZW0gdGFibGVzcGFjZSBmcm9tIHRoZSB0
YWJsZXNwYWNlIGhlYWRlci4gIElmCiB3ZSBkbyBub3QgaGF2ZSBhbiBhdXRvLWV4dGVuZGluZyBk
YXRhIGZpbGUsIHRoaXMgc2hvdWxkIGJlIGVxdWFsIHRvCiB0aGUgc2l6ZSBvZiB0aGUgZGF0YSBm
aWxlcy4gIElmIHRoZXJlIGlzIGFuIGF1dG8tZXh0ZW5kaW5nIGRhdGEgZmlsZSwKQEAgLTEzOTUs
MTUgKzEzNjMsNiBAQCBmc3BfZmlsbF9mcmVlX2xpc3QoCiAJCW1sb2dfd3JpdGVfdWxpbnQoaGVh
ZGVyICsgRlNQX0ZSRUVfTElNSVQsIGkgKyBGU1BfRVhURU5UX1NJWkUsCiAJCQkJIE1MT0dfNEJZ
VEVTLCBtdHIpOwogCi0JCS8qIFVwZGF0ZSB0aGUgZnJlZSBsaW1pdCBpbmZvIGluIHRoZSBsb2cg
c3lzdGVtIGFuZCBtYWtlCi0JCWEgY2hlY2twb2ludCAqLwotCQlpZiAoc3BhY2UgPT0gMCkgewot
CQkJdXRfYSghemlwX3NpemUpOwotCQkJbG9nX2ZzcF9jdXJyZW50X2ZyZWVfbGltaXRfc2V0X2Fu
ZF9jaGVja3BvaW50KAotCQkJCShpICsgRlNQX0VYVEVOVF9TSVpFKQotCQkJCS8gKCgxMDI0ICog
MTAyNCkgLyBVTklWX1BBR0VfU0laRSkpOwotCQl9Ci0KIAkJaWYgKFVOSVZfVU5MSUtFTFkoaW5p
dF94ZGVzKSkgewogCiAJCQlidWZfYmxvY2tfdCoJYmxvY2s7Cgo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2ZzcDBmc3AuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL2ZzcDBmc3AuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQw
NjA3MzcxMC11bzRjMGIzYW82a2Y4M2FoCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9m
c3AwZnNwLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MDYxMTA3NDQtY2Z1
b2IzbGZkcDhidTZtbwpAQCAtNDEsMTYgKzQxLDYgQEAgdm9pZAogZnNwX2luaXQodm9pZCk7CiAv
Kj09PT09PT09PT0qLwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1HZXRzIHRoZSBjdXJyZW50IGZyZWUg
bGltaXQgb2YgdGhlIHN5c3RlbSB0YWJsZXNwYWNlLiAgVGhlIGZyZWUgbGltaXQKLW1lYW5zIHRo
ZSBwbGFjZSBvZiB0aGUgZmlyc3QgcGFnZSB3aGljaCBoYXMgbmV2ZXIgYmVlbiBwdXQgdG8gdGhl
Ci1mcmVlIGxpc3QgZm9yIGFsbG9jYXRpb24uICBUaGUgc3BhY2UgYWJvdmUgdGhhdCBhZGRyZXNz
IGlzIGluaXRpYWxpemVkCi10byB6ZXJvLiAgU2V0cyBhbHNvIHRoZSBnbG9iYWwgdmFyaWFibGUg
bG9nX2ZzcF9jdXJyZW50X2ZyZWVfbGltaXQuCi1AcmV0dXJuCWZyZWUgbGltaXQgaW4gbWVnYWJ5
dGVzICovCi1VTklWX0lOVEVSTgotdWxpbnQKLWZzcF9oZWFkZXJfZ2V0X2ZyZWVfbGltaXQodm9p
ZCk7Ci0vKj09PT09PT09PT09PT09PT09PT09PT09PT09PSovCi0vKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioK
IEdldHMgdGhlIHNpemUgb2YgdGhlIHN5c3RlbSB0YWJsZXNwYWNlIGZyb20gdGhlIHRhYmxlc3Bh
Y2UgaGVhZGVyLiAgSWYKIHdlIGRvIG5vdCBoYXZlIGFuIGF1dG8tZXh0ZW5kaW5nIGRhdGEgZmls
ZSwgdGhpcyBzaG91bGQgYmUgZXF1YWwgdG8KIHRoZSBzaXplIG9mIHRoZSBkYXRhIGZpbGVzLiAg
SWYgdGhlcmUgaXMgYW4gYXV0by1leHRlbmRpbmcgZGF0YSBmaWxlLAoKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9sb2cwbG9nLmgnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9sb2cwbG9nLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MTA0MDYwNzM3MTAtdW80YzBiM2FvNmtmODNhaAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvbG9nMGxvZy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDA2MTEwNzQ0
LWNmdW9iM2xmZHA4YnU2bW8KQEAgLTY5LDE3ICs2OSw2IEBAIGV4dGVybglpYm9vbAlsb2dfZGVi
dWdfd3JpdGVzOwogLyoqIE1heGltdW0gbnVtYmVyIG9mIGxvZyBncm91cHMgaW4gbG9nX2dyb3Vw
X3N0cnVjdDo6Y2hlY2twb2ludF9idWYgKi8KICNkZWZpbmUgTE9HX01BWF9OX0dST1VQUwkzMgog
Ci0jaWZuZGVmIFVOSVZfSE9UQkFDS1VQCi0vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLVNldHMgdGhlIGdsb2JhbCB2
YXJpYWJsZSBsb2dfZnNwX2N1cnJlbnRfZnJlZV9saW1pdC4gQWxzbyBtYWtlcyBhIGNoZWNrcG9p
bnQsCi1zbyB0aGF0IHdlIGtub3cgdGhhdCB0aGUgbGltaXQgaGFzIGJlZW4gd3JpdHRlbiB0byBh
IGxvZyBjaGVja3BvaW50IGZpZWxkCi1vbiBkaXNrLiAqLwotVU5JVl9JTlRFUk4KLXZvaWQKLWxv
Z19mc3BfY3VycmVudF9mcmVlX2xpbWl0X3NldF9hbmRfY2hlY2twb2ludCgKLS8qPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLQl1bGludAlsaW1pdCk7CS8qITwg
aW46IGxpbWl0IHRvIHNldCAqLwotI2VuZGlmIC8qICFVTklWX0hPVEJBQ0tVUCAqLwogLyoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKiovLyoqCiBDYWxjdWxhdGVzIHdoZXJlIGluIGxvZyBmaWxlcyB3ZSBmaW5kIGEgc3BlY2lm
aWVkIGxzbi4KIEByZXR1cm4JbG9nIGZpbGUgbnVtYmVyICovCkBAIC02MzgsMjMgKzYyNywzOCBA
QCBleHRlcm4gbG9nX3QqCWxvZ19zeXM7CiAJCQkJCQkJKyBMT0dfTUFYX05fR1JPVVBTICogOCkK
ICNkZWZpbmUgTE9HX0NIRUNLUE9JTlRfQ0hFQ0tTVU1fMQlMT0dfQ0hFQ0tQT0lOVF9BUlJBWV9F
TkQKICNkZWZpbmUgTE9HX0NIRUNLUE9JTlRfQ0hFQ0tTVU1fMgkoNCArIExPR19DSEVDS1BPSU5U
X0FSUkFZX0VORCkKKyNpZiAwCiAjZGVmaW5lIExPR19DSEVDS1BPSU5UX0ZTUF9GUkVFX0xJTUlU
CSg4ICsgTE9HX0NIRUNLUE9JTlRfQVJSQVlfRU5EKQotCQkJCQkvKiBjdXJyZW50IGZzcCBmcmVl
IGxpbWl0IGluCisJCQkJCS8qITwgTm90IHVzZWQgKDApOworCQkJCQlUaGlzIHVzZWQgdG8gY29u
dGFpbiB0aGUKKwkJCQkJY3VycmVudCBmc3AgZnJlZSBsaW1pdCBpbgogCQkJCQl0YWJsZXNwYWNl
IDAsIGluIHVuaXRzIG9mIG9uZQotCQkJCQltZWdhYnl0ZTsgdGhpcyBpbmZvcm1hdGlvbiBpcyBv
bmx5IHVzZWQKLQkJCQkJYnkgaWJiYWNrdXAgdG8gZGVjaWRlIGlmIGl0IGNhbgotCQkJCQl0cnVu
Y2F0ZSB1bnVzZWQgZW5kcyBvZgotCQkJCQlub24tYXV0by1leHRlbmRpbmcgZGF0YSBmaWxlcyBp
biBzcGFjZQotCQkJCQkwICovCisJCQkJCW1lZ2FieXRlLgorCisJCQkJCVRoaXMgaW5mb3JtYXRp
b24gbWlnaHQgaGF2ZSBiZWVuIHVzZWQKKwkJCQkJc2luY2UgaWJiYWNrdXAgdmVyc2lvbiAwLjM1
IGJ1dAorCQkJCQliZWZvcmUgMS40MSB0byBkZWNpZGUgaWYgdW51c2VkIGVuZHMgb2YKKwkJCQkJ
bm9uLWF1dG8tZXh0ZW5kaW5nIGRhdGEgZmlsZXMKKwkJCQkJaW4gc3BhY2UgMCBjYW4gYmUgdHJ1
bmNhdGVkLgorCisJCQkJCVRoaXMgaW5mb3JtYXRpb24gd2FzIG1hZGUgb2Jzb2xldGUKKwkJCQkJ
YnkgaWJiYWNrdXAgLS1jb21wcmVzcy4gKi8KICNkZWZpbmUgTE9HX0NIRUNLUE9JTlRfRlNQX01B
R0lDX04JKDEyICsgTE9HX0NIRUNLUE9JTlRfQVJSQVlfRU5EKQotCQkJCQkvKiB0aGlzIG1hZ2lj
IG51bWJlciB0ZWxscyBpZiB0aGUKKwkJCQkJLyohPCBOb3QgdXNlZCAoMCk7CisJCQkJCVRoaXMg
bWFnaWMgbnVtYmVyIHRlbGxzIGlmIHRoZQogCQkJCQljaGVja3BvaW50IGNvbnRhaW5zIHRoZSBh
Ym92ZSBmaWVsZDoKIAkJCQkJdGhlIGZpZWxkIHdhcyBhZGRlZCB0bwotCQkJCQlJbm5vREItMy4y
My41MCAqLworCQkJCQlJbm5vREItMy4yMy41MCBhbmQKKwkJCQkJcmVtb3ZlZCBmcm9tIE15U1FM
IDUuNiAqLworI2RlZmluZSBMT0dfQ0hFQ0tQT0lOVF9GU1BfTUFHSUNfTl9WQUwJMTQ0MTIzMTI0
MworCQkJCQkvKiE8IGlmIExPR19DSEVDS1BPSU5UX0ZTUF9NQUdJQ19OCisJCQkJCWNvbnRhaW5z
IHRoaXMgdmFsdWUsIHRoZW4KKwkJCQkJTE9HX0NIRUNLUE9JTlRfRlNQX0ZSRUVfTElNSVQKKwkJ
CQkJaXMgdmFsaWQgKi8KKyNlbmRpZgogI2RlZmluZSBMT0dfQ0hFQ0tQT0lOVF9PRkZTRVRfSElH
SDMyCSgxNiArIExPR19DSEVDS1BPSU5UX0FSUkFZX0VORCkKICNkZWZpbmUgTE9HX0NIRUNLUE9J
TlRfU0laRQkJKDIwICsgTE9HX0NIRUNLUE9JTlRfQVJSQVlfRU5EKQogCi0jZGVmaW5lIExPR19D
SEVDS1BPSU5UX0ZTUF9NQUdJQ19OX1ZBTAkxNDQxMjMxMjQzCiAKIC8qIE9mZnNldHMgb2YgYSBs
b2cgZmlsZSBoZWFkZXIgKi8KICNkZWZpbmUgTE9HX0dST1VQX0lECQkwCS8qIGxvZyBncm91cCBu
dW1iZXIgKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2xvZy9sb2cwbG9n
LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzBsb2cuYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDExMDQwNjA3MzcxMC11bzRjMGIzYW82a2Y4M2FoCisrKyBiL3N0b3Jh
Z2UvaW5ub2Jhc2UvbG9nL2xvZzBsb2cuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDQwNjExMDc0NC1jZnVvYjNsZmRwOGJ1Nm1vCkBAIC03NiwxMCArNzYsNiBAQCByZWR1Y2Ug
dGhlIHNpemUgb2YgdGhlIGxvZy4KIAogKi8KIAotLyogQ3VycmVudCBmcmVlIGxpbWl0IG9mIHNw
YWNlIDA7IHByb3RlY3RlZCBieSB0aGUgbG9nIHN5cyBtdXRleDsgMCBtZWFucwotdW5pbml0aWFs
aXplZCAqLwotVU5JVl9JTlRFUk4gdWxpbnQJbG9nX2ZzcF9jdXJyZW50X2ZyZWVfbGltaXQJCT0g
MDsKLQogLyogR2xvYmFsIGxvZyBzeXN0ZW0gdmFyaWFibGUgKi8KIFVOSVZfSU5URVJOIGxvZ190
Kglsb2dfc3lzCT0gTlVMTDsKIApAQCAtMTY1LDMzICsxNjEsNiBAQCBsb2dfaW9fY29tcGxldGVf
YXJjaGl2ZSh2b2lkKTsKICNlbmRpZiAvKiBVTklWX0xPR19BUkNISVZFICovCiAKIC8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ly8qKgotU2V0cyB0aGUgZ2xvYmFsIHZhcmlhYmxlIGxvZ19mc3BfY3VycmVudF9mcmVlX2xpbWl0
LiBBbHNvIG1ha2VzIGEgY2hlY2twb2ludCwKLXNvIHRoYXQgd2Uga25vdyB0aGF0IHRoZSBsaW1p
dCBoYXMgYmVlbiB3cml0dGVuIHRvIGEgbG9nIGNoZWNrcG9pbnQgZmllbGQKLW9uIGRpc2suICov
Ci1VTklWX0lOVEVSTgotdm9pZAotbG9nX2ZzcF9jdXJyZW50X2ZyZWVfbGltaXRfc2V0X2FuZF9j
aGVja3BvaW50KAotLyo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0q
LwotCXVsaW50CWxpbWl0KQkvKiE8IGluOiBsaW1pdCB0byBzZXQgKi8KLXsKLQlpYm9vbAlzdWNj
ZXNzOwotCi0JbXV0ZXhfZW50ZXIoJihsb2dfc3lzLT5tdXRleCkpOwotCi0JbG9nX2ZzcF9jdXJy
ZW50X2ZyZWVfbGltaXQgPSBsaW1pdDsKLQotCW11dGV4X2V4aXQoJihsb2dfc3lzLT5tdXRleCkp
OwotCi0JLyogVHJ5IHRvIG1ha2UgYSBzeW5jaHJvbm91cyBjaGVja3BvaW50ICovCi0KLQlzdWNj
ZXNzID0gRkFMU0U7Ci0KLQl3aGlsZSAoIXN1Y2Nlc3MpIHsKLQkJc3VjY2VzcyA9IGxvZ19jaGVj
a3BvaW50KFRSVUUsIFRSVUUpOwotCX0KLX0KLQotLyoqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZXR1cm5zIHRoZSBv
bGRlc3QgbW9kaWZpZWQgYmxvY2sgbHNuIGluIHRoZSBwb29sLCBvciBsb2dfc3lzLT5sc24gaWYg
bm9uZQogZXhpc3RzLgogQHJldHVybglMU04gb2Ygb2xkZXN0IG1vZGlmaWNhdGlvbiAqLwpAQCAt
MTg0MCwxNSArMTgwOSw2IEBAIGxvZ19ncm91cF9jaGVja3BvaW50KAogCQkJICAgICAgTE9HX0NI
RUNLUE9JTlRfQ0hFQ0tTVU1fMiAtIExPR19DSEVDS1BPSU5UX0xTTik7CiAJbWFjaF93cml0ZV90
b180KGJ1ZiArIExPR19DSEVDS1BPSU5UX0NIRUNLU1VNXzIsIGZvbGQpOwogCi0JLyogU3RhcnRp
bmcgZnJvbSBJbm5vREItMy4yMy41MCwgd2UgYWxzbyB3cml0ZSBpbmZvIG9uIGFsbG9jYXRlZAot
CXNpemUgaW4gdGhlIHRhYmxlc3BhY2UgKi8KLQotCW1hY2hfd3JpdGVfdG9fNChidWYgKyBMT0df
Q0hFQ0tQT0lOVF9GU1BfRlJFRV9MSU1JVCwKLQkJCWxvZ19mc3BfY3VycmVudF9mcmVlX2xpbWl0
KTsKLQotCW1hY2hfd3JpdGVfdG9fNChidWYgKyBMT0dfQ0hFQ0tQT0lOVF9GU1BfTUFHSUNfTiwK
LQkJCUxPR19DSEVDS1BPSU5UX0ZTUF9NQUdJQ19OX1ZBTCk7Ci0KIAkvKiBXZSBhbHRlcm5hdGUg
dGhlIHBoeXNpY2FsIHBsYWNlIG9mIHRoZSBjaGVja3BvaW50IGluZm8gaW4gdGhlIGZpcnN0CiAJ
bG9nIGZpbGUgKi8KIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xv
ZzByZWN2LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzByZWN2LmMJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MDYwNzM3MTAtdW80YzBiM2FvNmtmODNhaAorKysg
Yi9zdG9yYWdlL2lubm9iYXNlL2xvZy9sb2cwcmVjdi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwNDA2MTEwNzQ0LWNmdW9iM2xmZHA4YnU2bW8KQEAgLTc2MiwxNSArNzYyLDEy
IEBAIFJlYWRzIHRoZSBjaGVja3BvaW50IGluZm8gbmVlZGVkIGluIGhvdAogQHJldHVybglUUlVF
IGlmIHN1Y2Nlc3MgKi8KIFVOSVZfSU5URVJOCiBpYm9vbAotcmVjdl9yZWFkX2NwX2luZm9fZm9y
X2JhY2t1cCgKLS8qPT09PT09PT09PT09PT09PT09PT09PT09PSovCityZWN2X3JlYWRfY2hlY2tw
b2ludF9pbmZvX2Zvcl9iYWNrdXAoCisvKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PSovCiAJY29uc3QgYnl0ZSoJaGRyLAkvKiE8IGluOiBidWZmZXIgY29udGFpbmluZyB0aGUgbG9n
IGdyb3VwCiAJCQkJaGVhZGVyICovCiAJbHNuX3QqCQlsc24sCS8qITwgb3V0OiBjaGVja3BvaW50
IGxzbiAqLwogCWxzbl90KgkJb2Zmc2V0LAkvKiE8IG91dDogY2hlY2twb2ludCBvZmZzZXQgaW4g
dGhlIGxvZyBncm91cCAqLwotCXVsaW50KgkJZnNwX2xpbWl0LC8qITwgb3V0OiBmc3AgbGltaXQg
b2Ygc3BhY2UgMCwKLQkJCQkxMDAwMDAwMDAwIGlmIHRoZSBkYXRhYmFzZSBpcyBydW5uaW5nCi0J
CQkJd2l0aCA8IHZlcnNpb24gMy4yMy41MCBvZiBJbm5vREIgKi8KIAlpYl91aW50NjRfdCoJY3Bf
bm8sCS8qITwgb3V0OiBjaGVja3BvaW50IG51bWJlciAqLwogCWliX3VpbnQ2NF90KglmaXJzdF9o
ZWFkZXJfbHNuKQogCQkJCS8qITwgb3V0OiBsc24gb2Ygb2YgdGhlIHN0YXJ0IG9mIHRoZQpAQCAt
ODA3LDIzICs4MDQsNiBAQCByZWN2X3JlYWRfY3BfaW5mb19mb3JfYmFja3VwKAogCSpvZmZzZXQg
fD0gbWFjaF9yZWFkX2Zyb21fNCgKIAkJY3BfYnVmICsgTE9HX0NIRUNLUE9JTlRfT0ZGU0VUX0hJ
R0gzMikgPDwgMzI7CiAKLQkvKiBJZiB0aGUgdXNlciBpcyBydW5uaW5nIGEgcHJlLTMuMjMuNTAg
dmVyc2lvbiBvZiBJbm5vREIsIGl0cwotCWNoZWNrcG9pbnQgZGF0YSBkb2VzIG5vdCBjb250YWlu
IHRoZSBmc3AgbGltaXQgaW5mbyAqLwotCWlmIChtYWNoX3JlYWRfZnJvbV80KGNwX2J1ZiArIExP
R19DSEVDS1BPSU5UX0ZTUF9NQUdJQ19OKQotCSAgICA9PSBMT0dfQ0hFQ0tQT0lOVF9GU1BfTUFH
SUNfTl9WQUwpIHsKLQotCQkqZnNwX2xpbWl0ID0gbWFjaF9yZWFkX2Zyb21fNCgKLQkJCWNwX2J1
ZiArIExPR19DSEVDS1BPSU5UX0ZTUF9GUkVFX0xJTUlUKTsKLQotCQlpZiAoKmZzcF9saW1pdCA9
PSAwKSB7Ci0JCQkqZnNwX2xpbWl0ID0gMTAwMDAwMDAwMDsKLQkJfQotCX0gZWxzZSB7Ci0JCSpm
c3BfbGltaXQgPSAxMDAwMDAwMDAwOwotCX0KLQotCS8qCWZwcmludGYoc3RkZXJyLCAiZnNwIGxp
bWl0ICVsdSBNQlxuIiwgKmZzcF9saW1pdCk7ICovCi0KIAkqY3Bfbm8gPSBtYWNoX3JlYWRfZnJv
bV84KGNwX2J1ZiArIExPR19DSEVDS1BPSU5UX05PKTsKIAogCSpmaXJzdF9oZWFkZXJfbHNuID0g
bWFjaF9yZWFkX2Zyb21fOChoZHIgKyBMT0dfRklMRV9TVEFSVF9MU04pOwoKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jJwotLS0gYS9zdG9yYWdlL2lu
bm9iYXNlL3Nydi9zcnYwc3RhcnQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEx
MDQwNjA3MzcxMC11bzRjMGIzYW82a2Y4M2FoCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3Ny
djBzdGFydC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDA2MTEwNzQ0LWNm
dW9iM2xmZHA4YnU2bW8KQEAgLTE2NzgsMTAgKzE2NzgsNiBAQCBpbm5vYmFzZV9zdGFydF9vcl9j
cmVhdGVfZm9yX215c3FsKHZvaWQpCiAKIAkJc3J2X3N0YXJ0dXBfaXNfYmVmb3JlX3RyeF9yb2xs
YmFja19waGFzZSA9IEZBTFNFOwogCi0JCS8qIEluaXRpYWxpemUgdGhlIGZzcCBmcmVlIGxpbWl0
IGdsb2JhbCB2YXJpYWJsZSBpbiB0aGUgbG9nCi0JCXN5c3RlbSAqLwotCQlmc3BfaGVhZGVyX2dl
dF9mcmVlX2xpbWl0KCk7Ci0KIAkJcmVjdl9yZWNvdmVyeV9mcm9tX2FyY2hpdmVfZmluaXNoKCk7
CiAjZW5kaWYgLyogVU5JVl9MT0dfQVJDSElWRSAqLwogCX0gZWxzZSB7CkBAIC0xNzM5LDEwICsx
NzM1LDYgQEAgaW5ub2Jhc2Vfc3RhcnRfb3JfY3JlYXRlX2Zvcl9teXNxbCh2b2lkKQogCiAJCXRy
eF9wdXJnZV9zeXNfY3JlYXRlKHNydl9uX3B1cmdlX3RocmVhZHMsIGliX2JoKTsKIAotCQkvKiBJ
bml0aWFsaXplIHRoZSBmc3AgZnJlZSBsaW1pdCBnbG9iYWwgdmFyaWFibGUgaW4gdGhlIGxvZwot
CQlzeXN0ZW0gKi8KLQkJZnNwX2hlYWRlcl9nZXRfZnJlZV9saW1pdCgpOwotCiAJCS8qIHJlY3Zf
cmVjb3ZlcnlfZnJvbV9jaGVja3BvaW50X2ZpbmlzaCBuZWVkcyB0cnggbGlzdHMgd2hpY2gKIAkJ
YXJlIGluaXRpYWxpemVkIGluIHRyeF9zeXNfaW5pdF9hdF9kYl9zdGFydCgpLiAqLwogCgo=

--===============1879105234==
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: e48519f7d896e3f26f0332eb4049671c2da4f61d
# timestamp: 2011-04-06 14:08:21 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   uo4c0b3ao6kf83ah
# 
# Begin bundle
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


--===============1879105234==--