From: marko.makela
Date: May 27 2012 6:45pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3871 to 3872) WL#6255
List-Archive: http://lists.mysql.com/commits/143963
Message-Id: <201205271845.q4RIjpuq005735@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NzIgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yNwogICAgICBXTCM2MjU1IHByZXBhcmF0aW9u
OiBTdXNwZW5kIHRoZSBwdXJnZSBpZiBpdCB3b3VsZCBmcmVlIEJMT0JzLgogICAgICAKICAgICAg
V2UgY2Fubm90IGZyZWUgQkxPQnMgZHVyaW5nIG9ubGluZSB0YWJsZSByZWJ1aWxkLCBiZWNhdXNl
IHdlIGRvIG5vdCB3cml0ZQogICAgICB0aGUgQkxPQnMgdG8gdGhlIG9ubGluZSBsb2cuIE9ubGlu
ZSBsb2cgYXBwbHkgYXNzdW1lcyB0aGF0IHRoZSBCTE9CcyBhcmUKICAgICAgYWNjZXNzaWJsZS4K
ICAgICAgCiAgICAgIHJvd19wdXJnZV91cGRfZXhpc3Rfb3JfZXh0ZXJuX2Z1bmMoKSwgcm93X3B1
cmdlX3JlY29yZF9mdW5jKCk6IFJldHVybiB0cnVlCiAgICAgIGlmIHRoZSByZWNvcmQgd2FzIHB1
cmdlZCwgZmFsc2UgaWYgaXQgd291bGQgZnJlZSBCTE9CcyBvZiBhIHRhYmxlIHRoYXQgaXMKICAg
ICAgYmVpbmcgcmVidWlsdCBvbmxpbmUuCiAgICAgIAogICAgICByb3dfcHVyZ2UoKTogSWYgYSBy
ZWNvcmQgaXMgbm90IHB1cmdlYWJsZSwgcmV0cnkgaW4gMSBzZWNvbmQsIHVudGlsIHRoZQogICAg
ICBzZXJ2ZXIgaXMgc2h1dCBkb3duIGlzIGluaXRpYXRlZC4gVE9ETzogbW92ZSB0aGUgcmVjb3Jk
IGFzaWRlLCBhbmQgY29udGludWUKICAgICAgd2l0aCB0aGUgcmVzdCBvZiB0aGUgcHVyZ2UuCgog
ICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBwdXJnZS5jYwogMzg3
MSBNYXJrbyBNw6RrZWzDpAkyMDEyLTA1LTI2CiAgICAgIFdMIzYyNTUgcHJlcGFyYXRpb246IEFs
bG93IGZsYWdzIHRvIGJlIHNwZWNpZmllZCBvbiByb3cgaW5zZXJ0LgogICAgICAKICAgICAgcm93
X2luc19jbHVzdF9pbmRleF9lbnRyeV9sb3coKSwgcm93X2luc19zZWNfaW5kZXhfZW50cnlfbG93
KCk6CiAgICAgIE1ha2UgdGhlIGZ1bmN0aW9ucyBwdWJsaWMsIGFuZCBhZGQgYSBmbGFncyBwYXJh
bWV0ZXIsIHNvIHRoYXQKICAgICAgb25saW5lIHJlYnVpbGQgbG9nIGFwcGx5IGNhbiBza2lwIGxv
Y2tpbmcgYW5kIHVuZG8gbG9nZ2luZy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL3JvdzBpbnMuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5z
LmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcHVyZ2UuY2Mn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBwdXJnZS5jYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEyMDUyNjA0MzQ0NS1qejVkODQyN3EybTBhaDg0CisrKyBiL3N0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzBwdXJnZS5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDEyMDUyNzE4MzQ1NS1qM3psN3IwaWFsNzg2MGJ1CkBAIC00NSw2ICs0NSw3IEBAIENyZWF0
ZWQgMy8xNC8xOTk3IEhlaWtraSBUdXVyaQogI2luY2x1ZGUgInJvdzBsb2cuaCIKICNpbmNsdWRl
ICJsb2cwbG9nLmgiCiAjaW5jbHVkZSAic3J2MG1vbi5oIgorI2luY2x1ZGUgInNydjBzdGFydC5o
IgogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKgogSU1QT1JUQU5UIE5PVEU6IEFueSBvcGVyYXRpb24gdGhh
dCBnZW5lcmF0ZXMgcmVkbyBNVVNUIGNoZWNrIHRoYXQgdGhlcmUKQEAgLTUzNyw5ICs1MzgsMTAg
QEAgcm93X3B1cmdlX2RlbF9tYXJrKAogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBQdXJnZXMgYW4gdXBkYXRlIG9mIGFu
IGV4aXN0aW5nIHJlY29yZC4gQWxzbyBwdXJnZXMgYW4gdXBkYXRlIG9mIGEgZGVsZXRlCi1tYXJr
ZWQgcmVjb3JkIGlmIHRoYXQgcmVjb3JkIGNvbnRhaW5lZCBhbiBleHRlcm5hbGx5IHN0b3JlZCBm
aWVsZC4gKi8KLXN0YXRpYwotdm9pZAorbWFya2VkIHJlY29yZCBpZiB0aGF0IHJlY29yZCBjb250
YWluZWQgYW4gZXh0ZXJuYWxseSBzdG9yZWQgZmllbGQuCitAcmV0dXJuIHRydWUgaWYgcHVyZ2Vk
LCBmYWxzZSBpZiBza2lwcGVkICovCitzdGF0aWMgX19hdHRyaWJ1dGVfXygobm9ubnVsbCwgd2Fy
bl91bnVzZWRfcmVzdWx0KSkKK2Jvb2wKIHJvd19wdXJnZV91cGRfZXhpc3Rfb3JfZXh0ZXJuX2Z1
bmMoCiAvKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwogI2lmZGVmIFVOSVZfREVC
VUcKQEAgLTU1NCw2ICs1NTYsMjAgQEAgcm93X3B1cmdlX3VwZF9leGlzdF9vcl9leHRlcm5fZnVu
YygKIAl1dF9hZChyd19sb2NrX293bigmZGljdF9vcGVyYXRpb25fbG9jaywgUldfTE9DS19TSEFS
RUQpKTsKICNlbmRpZiAvKiBVTklWX1NZTkNfREVCVUcgKi8KIAorCWlmIChkaWN0X2luZGV4X2dl
dF9vbmxpbmVfc3RhdHVzKGRpY3RfdGFibGVfZ2V0X2ZpcnN0X2luZGV4KAorCQkJCQkJIG5vZGUt
PnRhYmxlKSkKKwkgICAgPT0gT05MSU5FX0lOREVYX0NSRUFUSU9OKSB7CisJCWZvciAodWxpbnQg
aSA9IDA7IGkgPCB1cGRfZ2V0X25fZmllbGRzKG5vZGUtPnVwZGF0ZSk7IGkrKykgeworCisJCQlj
b25zdCB1cGRfZmllbGRfdCoJdWZpZWxkCisJCQkJPSB1cGRfZ2V0X250aF9maWVsZChub2RlLT51
cGRhdGUsIGkpOworCisJCQlpZiAoZGZpZWxkX2lzX2V4dCgmdWZpZWxkLT5uZXdfdmFsKSkgewor
CQkJCXJldHVybihmYWxzZSk7CisJCQl9CisJCX0KKwl9CisKIAlpZiAobm9kZS0+cmVjX3R5cGUg
PT0gVFJYX1VORE9fVVBEX0RFTF9SRUMKIAkgICAgfHwgKG5vZGUtPmNtcGxfaW5mbyAmIFVQRF9O
T0RFX05PX09SRF9DSEFOR0UpKSB7CiAKQEAgLTYyOSw5ICs2NDUsMTcgQEAgc2tpcF9zZWNvbmRh
cmllczoKIAkJCWluZGV4IHRyZWUgKi8KIAogCQkJaW5kZXggPSBkaWN0X3RhYmxlX2dldF9maXJz
dF9pbmRleChub2RlLT50YWJsZSk7Ci0KIAkJCW10cl94X2xvY2soZGljdF9pbmRleF9nZXRfbG9j
ayhpbmRleCksICZtdHIpOwotCisjaWZkZWYgVU5JVl9ERUJVRworCQkJc3dpdGNoIChkaWN0X2lu
ZGV4X2dldF9vbmxpbmVfc3RhdHVzKGluZGV4KSkgeworCQkJY2FzZSBPTkxJTkVfSU5ERVhfQ1JF
QVRJT046CisJCQljYXNlIE9OTElORV9JTkRFWF9BQk9SVEVEX0RST1BQRUQ6CisJCQkJdXRfYWQo
MCk7CisJCQljYXNlIE9OTElORV9JTkRFWF9DT01QTEVURToKKwkJCWNhc2UgT05MSU5FX0lOREVY
X0FCT1JURUQ6CisJCQkJYnJlYWs7CisJCQl9CisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLwogCQkJ
LyogTk9URTogd2UgbXVzdCBhbHNvIGFjcXVpcmUgYW4gWC1sYXRjaCB0byB0aGUKIAkJCXJvb3Qg
cGFnZSBvZiB0aGUgdHJlZS4gV2Ugd2lsbCBuZWVkIGl0IHdoZW4gd2UKIAkJCWZyZWUgcGFnZXMg
ZnJvbSB0aGUgdHJlZS4gSWYgdGhlIHRyZWUgaXMgb2YgaGVpZ2h0IDEsCkBAIC02NjEsNiArNjg1
LDggQEAgc2tpcF9zZWNvbmRhcmllczoKIAkJCW10cl9jb21taXQoJm10cik7CiAJCX0KIAl9CisK
KwlyZXR1cm4odHJ1ZSk7CiB9CiAKICNpZmRlZiBVTklWX0RFQlVHCkBAIC03NzYsOSArODAyLDEw
IEBAIGVycl9leGl0OgogfQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1QdXJnZXMgdGhlIHBhcnNlZCByZWNvcmQuICov
Ci1zdGF0aWMKLXZvaWQKK1B1cmdlcyB0aGUgcGFyc2VkIHJlY29yZC4KK0ByZXR1cm4gdHJ1ZSBp
ZiBwdXJnZWQsIGZhbHNlIGlmIHNraXBwZWQgKi8KK3N0YXRpYyBfX2F0dHJpYnV0ZV9fKChub25u
dWxsLCB3YXJuX3VudXNlZF9yZXN1bHQpKQorYm9vbAogcm93X3B1cmdlX3JlY29yZF9mdW5jKAog
Lyo9PT09PT09PT09PT09PT09PT0qLwogCXB1cmdlX25vZGVfdCoJbm9kZSwJCS8qITwgaW46IHJv
dyBwdXJnZSBub2RlICovCkBAIC04MDYsNyArODMzLDkgQEAgcm93X3B1cmdlX3JlY29yZF9mdW5j
KAogCQl9CiAJCS8qIGZhbGwgdGhyb3VnaCAqLwogCWNhc2UgVFJYX1VORE9fVVBEX0VYSVNUX1JF
QzoKLQkJcm93X3B1cmdlX3VwZF9leGlzdF9vcl9leHRlcm4odGhyLCBub2RlLCB1bmRvX3JlYyk7
CisJCWlmICghcm93X3B1cmdlX3VwZF9leGlzdF9vcl9leHRlcm4odGhyLCBub2RlLCB1bmRvX3Jl
YykpIHsKKwkJCXJldHVybihmYWxzZSk7CisJCX0KIAkJTU9OSVRPUl9JTkMoTU9OSVRPUl9OX1VQ
RF9FWElTVF9FWFRFUk4pOwogCQlicmVhazsKIAl9CkBAIC04MTksNiArODQ4LDggQEAgcm93X3B1
cmdlX3JlY29yZF9mdW5jKAogCQlkaWN0X3RhYmxlX2Nsb3NlKG5vZGUtPnRhYmxlLCBGQUxTRSwg
RkFMU0UpOwogCQlub2RlLT50YWJsZSA9IE5VTEw7CiAJfQorCisJcmV0dXJuKHRydWUpOwogfQog
CiAjaWZkZWYgVU5JVl9ERUJVRwpAQCAtODQ3LDEyICs4NzgsMjEgQEAgcm93X3B1cmdlKAogCWlm
ICh1bmRvX3JlYyAhPSAmdHJ4X3B1cmdlX2R1bW15X3JlYykgewogCQlpYm9vbAl1cGRhdGVkX2V4
dGVybjsKIAotCQlpZiAocm93X3B1cmdlX3BhcnNlX3VuZG9fcmVjKAotCQkJbm9kZSwgdW5kb19y
ZWMsICZ1cGRhdGVkX2V4dGVybiwgdGhyKSkgeworCQl3aGlsZSAocm93X3B1cmdlX3BhcnNlX3Vu
ZG9fcmVjKAorCQkJICAgICAgIG5vZGUsIHVuZG9fcmVjLCAmdXBkYXRlZF9leHRlcm4sIHRocikp
IHsKKworCQkJYm9vbCBwdXJnZWQgPSByb3dfcHVyZ2VfcmVjb3JkKAorCQkJCW5vZGUsIHVuZG9f
cmVjLCB0aHIsIHVwZGF0ZWRfZXh0ZXJuKTsKIAotCQkJcm93X3B1cmdlX3JlY29yZChub2RlLCB1
bmRvX3JlYywgdGhyLCB1cGRhdGVkX2V4dGVybik7CisJCQlyd19sb2NrX3NfdW5sb2NrKCZkaWN0
X29wZXJhdGlvbl9sb2NrKTsKKworCQkJaWYgKHB1cmdlZAorCQkJICAgIHx8IHNydl9zaHV0ZG93
bl9zdGF0ZSAhPSBTUlZfU0hVVERPV05fTk9ORSkgeworCQkJCXJldHVybjsKKwkJCX0KIAotCQkJ
cndfbG9ja19zX3VubG9ja19nZW4oJmRpY3Rfb3BlcmF0aW9uX2xvY2ssIDApOworCQkJLyogUmV0
cnkgdGhlIHB1cmdlIGluIGEgc2Vjb25kLiAqLworCQkJb3NfdGhyZWFkX3NsZWVwKDEwMDAwMDAp
OwogCQl9CiAJfQogfQoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxz
KS4=