From: marko.makela
Date: September 21 2012 6:55am
Subject: bzr push into mysql-5.6-wl6494 branch (marko.makela:4303 to 4304) WL#6494
List-Archive: http://lists.mysql.com/commits/144843
Message-Id: <20120921065540.10679.11208.4304@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQzMDQgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yMQogICAgICBXTCM2NDk0OiBSZXBsYWNlIHJl
ZG8gbG9ncyB3aGVuIG5lZWRlZC4KICAgICAgCiAgICAgIGZpbF9jbG9zZV9sb2dfZmlsZXMoKTog
Q2xvc2UgYWxsIHJlZG8gbG9nIGZpbGVzLgogICAgICBGb3JrZWQgZnJvbSBmaWxfY2xvc2VfYWxs
X2ZpbGVzKCkuCiAgICAgIAogICAgICBpbm5vYmFzZV9zdGFydF9vcl9jcmVhdGVfZm9yX215c3Fs
KCk6IFJlcGxhY2UgdGhlIHJlZG8gbG9nIGZpbGVzCiAgICAgIGlmIHRoZWlyIGN1cnJlbnQgc2l6
ZSBvciBhbW91bnQgZGlmZmVycyBmcm9tIHRoZSBjb25maWd1cmF0aW9uLgoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmlsLmNjCiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9maWwwZmlsLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0
YXJ0LmNjCiA0MzAzIE1hcmtvIE3DpGtlbMOkCTIwMTItMDktMjAKICAgICAgRml4IGVycm9ycyBp
biB0aGUgcHJldmlvdXMgY29tbWl0LCByZWZhY3RvcmluZyBvZiBvcGVuX29yX2NyZWF0ZV9sb2df
ZmlsZSgpLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3Rh
cnQuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuY2Mn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuY2MJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMjA5MjAxOTIxNTYtcmtxcjVhYTQyemJyeWR3egorKysgYi9zdG9yYWdl
L2lubm9iYXNlL2ZpbC9maWwwZmlsLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTIwOTIxMDY0NDU4LXZ6bnB5YWZ1dmhiNnc4MXQKQEAgLTE3NjIsNiArMTc2Miw0NiBAQCBmaWxf
Y2xvc2VfYWxsX2ZpbGVzKHZvaWQpCiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgorQ2xvc2VzIHRoZSBy
ZWRvIGxvZyBmaWxlcy4gVGhlcmUgbXVzdCBub3QgYmUgYW55IHBlbmRpbmcgaS9vJ3Mgb3Igbm90
CitmbHVzaGVkIG1vZGlmaWNhdGlvbnMgaW4gdGhlIGZpbGVzLiAqLworVU5JVl9JTlRFUk4KK3Zv
aWQKK2ZpbF9jbG9zZV9sb2dfZmlsZXModm9pZCkKKy8qPT09PT09PT09PT09PT09PT09PT09Ki8K
K3sKKwlmaWxfc3BhY2VfdCoJc3BhY2U7CisKKwltdXRleF9lbnRlcigmZmlsX3N5c3RlbS0+bXV0
ZXgpOworCisJc3BhY2UgPSBVVF9MSVNUX0dFVF9GSVJTVChmaWxfc3lzdGVtLT5zcGFjZV9saXN0
KTsKKworCXdoaWxlIChzcGFjZSAhPSBOVUxMKSB7CisJCWZpbF9ub2RlX3QqCW5vZGU7CisJCWZp
bF9zcGFjZV90KglwcmV2X3NwYWNlID0gc3BhY2U7CisKKwkJaWYgKHNwYWNlLT5wdXJwb3NlICE9
IEZJTF9MT0cpIHsKKwkJCXNwYWNlID0gVVRfTElTVF9HRVRfTkVYVChzcGFjZV9saXN0LCBzcGFj
ZSk7CisJCQljb250aW51ZTsKKwkJfQorCisJCWZvciAobm9kZSA9IFVUX0xJU1RfR0VUX0ZJUlNU
KHNwYWNlLT5jaGFpbik7CisJCSAgICAgbm9kZSAhPSBOVUxMOworCQkgICAgIG5vZGUgPSBVVF9M
SVNUX0dFVF9ORVhUKGNoYWluLCBub2RlKSkgeworCisJCQlpZiAobm9kZS0+b3BlbikgeworCQkJ
CWZpbF9ub2RlX2Nsb3NlX2ZpbGUobm9kZSwgZmlsX3N5c3RlbSk7CisJCQl9CisJCX0KKworCQlz
cGFjZSA9IFVUX0xJU1RfR0VUX05FWFQoc3BhY2VfbGlzdCwgc3BhY2UpOworCisJCWZpbF9zcGFj
ZV9mcmVlKHByZXZfc3BhY2UtPmlkLCBGQUxTRSk7CisJfQorCisJbXV0ZXhfZXhpdCgmZmlsX3N5
c3RlbS0+bXV0ZXgpOworfQorCisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFNldHMgdGhlIG1heCB0YWJsZXNw
YWNlIGlkIGNvdW50ZXIgaWYgdGhlIGdpdmVuIG51bWJlciBpcyBiaWdnZXIgdGhhbiB0aGUKIHBy
ZXZpb3VzIHZhbHVlLiAqLwogVU5JVl9JTlRFUk4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvZmlsMGZpbC5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvZmlsMGZpbC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTIwMTkyMTU2
LXJrcXI1YWE0Mnpicnlkd3oKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2ZpbDBmaWwu
aAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyMTA2NDQ1OC12em5weWFmdXZo
YjZ3ODF0CkBAIC0zMjUsNiArMzI1LDEzIEBAIHZvaWQKIGZpbF9jbG9zZV9hbGxfZmlsZXModm9p
ZCk7CiAvKj09PT09PT09PT09PT09PT09PT09PSovCiAvKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKK0Nsb3NlcyB0
aGUgcmVkbyBsb2cgZmlsZXMuIFRoZXJlIG11c3Qgbm90IGJlIGFueSBwZW5kaW5nIGkvbydzIG9y
IG5vdAorZmx1c2hlZCBtb2RpZmljYXRpb25zIGluIHRoZSBmaWxlcy4gKi8KK1VOSVZfSU5URVJO
Cit2b2lkCitmaWxfY2xvc2VfbG9nX2ZpbGVzKHZvaWQpOworLyo9PT09PT09PT09PT09PT09PT09
PT0qLworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKiovLyoqCiBTZXRzIHRoZSBtYXggdGFibGVzcGFjZSBpZCBjb3VudGVy
IGlmIHRoZSBnaXZlbiBudW1iZXIgaXMgYmlnZ2VyIHRoYW4gdGhlCiBwcmV2aW91cyB2YWx1ZS4g
Ki8KIFVOSVZfSU5URVJOCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9zcnYv
c3J2MHN0YXJ0LmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuY2MJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA5MjAxOTIxNTYtcmtxcjVhYTQyemJyeWR3
egorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuY2MJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMjA5MjEwNjQ0NTgtdnpucHlhZnV2aGI2dzgxdApAQCAtMjExMSwx
MSArMjExMSw2IEBAIGNyZWF0ZV9sb2dfZmlsZXM6CiAJCQlyZXR1cm4oREJfRVJST1IpOwogCQl9
CiAKLQkJaWYgKGkgIT0gc3J2X25fbG9nX2ZpbGVzCi0JCSAgICB8fCBzcnZfbG9nX2ZpbGVfc2l6
ZV9yZXF1ZXN0ZWQgIT0gc3J2X2xvZ19maWxlX3NpemUpIHsKLQkJCXV0X2Vycm9yOyAvKiBUT0RP
ICovCi0JCX0KLQogCQkvKiBTaW5jZSB0aGUgaW5zZXJ0IGJ1ZmZlciBpbml0IGlzIGluIGRpY3Rf
Ym9vdCwgYW5kIHRoZQogCQlpbnNlcnQgYnVmZmVyIGlzIG5lZWRlZCBpbiBhbnkgZGlzayBpL28s
IGZpcnN0IHdlIGNhbGwKIAkJZGljdF9ib290KCkuIE5vdGUgdGhhdCB0cnhfc3lzX2luaXRfYXRf
ZGJfc3RhcnQoKSBvbmx5IG5lZWRzCkBAIC0yMTU3LDYgKzIxNTIsMTI5IEBAIGNyZWF0ZV9sb2df
ZmlsZXM6CiAJCQkJcmVjdl9uZWVkZWRfcmVjb3ZlcnkpOwogCQl9CiAKKwkJaWYgKCFzcnZfZm9y
Y2VfcmVjb3ZlcnkKKwkJICAgICYmICFyZWN2X3N5cy0+Zm91bmRfY29ycnVwdF9sb2cKKwkJICAg
ICYmIChzcnZfbG9nX2ZpbGVfc2l6ZV9yZXF1ZXN0ZWQgIT0gc3J2X2xvZ19maWxlX3NpemUKKwkJ
CXx8IGkgIT0gc3J2X25fbG9nX2ZpbGVzKSkgeworCQkJLyogUHJlcGFyZSB0byByZXBsYWNlIHRo
ZSByZWRvIGxvZyBmaWxlcy4gKi8KKworCQkJLyogQ2xlYW4gdGhlIGJ1ZmZlciBwb29sLiAqLwor
CQkJYm9vbCBzdWNjZXNzID0gYnVmX2ZsdXNoX2xpc3QoCisJCQkJVUxJTlRfTUFYLCBMU05fTUFY
LCBOVUxMKTsKKwkJCXV0X2Eoc3VjY2Vzcyk7CisKKwkJCW1pbl9mbHVzaGVkX2xzbiA9IG1heF9m
bHVzaGVkX2xzbiA9IGxvZ19nZXRfbHNuKCk7CisKKwkJCWliX2xvZ2YoSUJfTE9HX0xFVkVMX1dB
Uk4sCisJCQkJIlJlc2l6aW5nIHJlZG8gbG9nIGZyb20gJXUqJXUgdG8gJXUqJXUgcGFnZXMiCisJ
CQkJIiwgTFNOPSIgTFNOX1BGLAorCQkJCSh1bnNpZ25lZCkgaSwKKwkJCQkodW5zaWduZWQpIHNy
dl9sb2dfZmlsZV9zaXplLAorCQkJCSh1bnNpZ25lZCkgc3J2X25fbG9nX2ZpbGVzLAorCQkJCSh1
bnNpZ25lZCkgc3J2X2xvZ19maWxlX3NpemVfcmVxdWVzdGVkLAorCQkJCW1heF9mbHVzaGVkX2xz
bik7CisKKwkJCWJ1Zl9mbHVzaF93YWl0X2JhdGNoX2VuZChOVUxMLCBCVUZfRkxVU0hfTElTVCk7
CisKKwkJCS8qIEZsdXNoIHRoZSBvbGQgbG9nIGZpbGVzLiAqLworCQkJbG9nX2J1ZmZlcl9mbHVz
aF90b19kaXNrKCk7CisKKwkJCXV0X2FkKG1heF9mbHVzaGVkX2xzbiA9PSBsb2dfZ2V0X2xzbigp
KTsKKworCQkJdXRfZChyZWN2X25vX2xvZ193cml0ZSA9IFRSVUUpOworCQkJdXRfYWQoIWJ1Zl9w
b29sX2NoZWNrX25vX3BlbmRpbmdfaW8oKSk7CisKKwkJCS8qIFN0YW1wIHRoZSBMU04gdG8gdGhl
IGRhdGEgZmlsZXMuICovCisJCQlmaWxfd3JpdGVfZmx1c2hlZF9sc25fdG9fZGF0YV9maWxlcygK
KwkJCQltYXhfZmx1c2hlZF9sc24sIDApOworCisJCQlmaWxfZmx1c2hfZmlsZV9zcGFjZXMoRklM
X1RBQkxFU1BBQ0UpOworCisJCQkvKiBDbG9zZSB0aGUgcmVkbyBsb2cgZmlsZXMsIHNvIHRoYXQg
d2UgY2FuCisJCQlyZXBsYWNlIHRoZW0uICovCisJCQlmaWxfY2xvc2VfbG9nX2ZpbGVzKCk7CisK
KwkJCS8qIEZyZWUgdGhlIG9sZCBsb2cgZmlsZSBzcGFjZS4gKi8KKwkJCWxvZ19ncm91cF9jbG9z
ZV9hbGwoKTsKKworCQkJaWJfbG9nZihJQl9MT0dfTEVWRUxfV0FSTiwKKwkJCQkiU3RhcnRpbmcg
dG8gZGVsZXRlIGFuZCByZXdyaXRlIGxvZyBmaWxlcy4iKTsKKworCQkJLyogUmVtb3ZlIHRoZSBv
bGQgbG9nIGZpbGVzLiAqLworCQkJZm9yICh1bGludCBqID0gMDsgaiA8IGk7IGorKykgeworCQkJ
CW9zX2ZpbGVfc3RhdF90CXN0YXRfaW5mbzsKKworCQkJCXNwcmludGYobG9nZmlsZW5hbWUgKyBk
aXJuYW1lbGVuLAorCQkJCQkiaWJfbG9nZmlsZSVsdSIsICh1bG9uZykgaik7CisKKwkJCQllcnIg
PSBvc19maWxlX2dldF9zdGF0dXMoCisJCQkJCWxvZ2ZpbGVuYW1lLCAmc3RhdF9pbmZvLCBmYWxz
ZSk7CisKKwkJCQlpZiAoZXJyID09IERCX05PVF9GT1VORCkgeworCQkJCQlicmVhazsKKwkJCQl9
CisKKwkJCQlpZiAoIW9zX2ZpbGVfZGVsZXRlKGxvZ2ZpbGVuYW1lKSkgeworCQkJCQlyZXR1cm4o
REJfRVJST1IpOworCQkJCX0KKwkJCX0KKworCQkJdXRfYWQoIWJ1Zl9wb29sX2NoZWNrX25vX3Bl
bmRpbmdfaW8oKSk7CisKKwkJCXNydl9sb2dfZmlsZV9zaXplID0gc3J2X2xvZ19maWxlX3NpemVf
cmVxdWVzdGVkOworCisJCQkvKiBDcmVhdGUgbmV3IGxvZyBmaWxlcy4gKi8KKwkJCWZvciAoaSA9
IDA7IGkgPCBzcnZfbl9sb2dfZmlsZXM7IGkrKykgeworCQkJCXNwcmludGYobG9nZmlsZW5hbWUg
KyBkaXJuYW1lbGVuLAorCQkJCQkiaWJfbG9nZmlsZSVsdSIsICh1bG9uZykgaSk7CisKKwkJCQll
cnIgPSBjcmVhdGVfbG9nX2ZpbGUoJmZpbGVzW2ldLCBsb2dmaWxlbmFtZSk7CisKKwkJCQlpZiAo
ZXJyICE9IERCX1NVQ0NFU1MpIHsKKwkJCQkJcmV0dXJuKGVycik7CisJCQkJfQorCQkJfQorCisJ
CQlsb2dfY3JlYXRlZCA9IFRSVUU7CisKKwkJCXNwcmludGYobG9nZmlsZW5hbWUgKyBkaXJuYW1l
bGVuLAorCQkJCSJpYl9sb2dmaWxlJWx1IiwgMFVMKTsKKworCQkJZmlsX3NwYWNlX2NyZWF0ZSgK
KwkJCQlsb2dmaWxlbmFtZSwgU1JWX0xPR19TUEFDRV9GSVJTVF9JRCwKKwkJCQlmc3BfZmxhZ3Nf
c2V0X3BhZ2Vfc2l6ZSgwLCBVTklWX1BBR0VfU0laRSksCisJCQkJRklMX0xPRyk7CisJCQl1dF9h
KGZpbF92YWxpZGF0ZSgpKTsKKworCQkJZm9yIChpID0gMDsgaSA8IHNydl9uX2xvZ19maWxlczsg
aSsrKSB7CisJCQkJc3ByaW50Zihsb2dmaWxlbmFtZSArIGRpcm5hbWVsZW4sCisJCQkJCSJpYl9s
b2dmaWxlJWx1IiwgKHVsb25nKSBpKTsKKworCQkJCWZpbF9ub2RlX2NyZWF0ZSgKKwkJCQkJbG9n
ZmlsZW5hbWUsICh1bGludCkgc3J2X2xvZ19maWxlX3NpemUsCisJCQkJCVNSVl9MT0dfU1BBQ0Vf
RklSU1RfSUQsIEZBTFNFKTsKKwkJCX0KKworCQkJbG9nX2dyb3VwX2luaXQoMCwgc3J2X25fbG9n
X2ZpbGVzLAorCQkJCSAgICAgICBzcnZfbG9nX2ZpbGVfc2l6ZSAqIFVOSVZfUEFHRV9TSVpFLAor
CQkJCSAgICAgICBTUlZfTE9HX1NQQUNFX0ZJUlNUX0lELAorCQkJCSAgICAgICBTUlZfTE9HX1NQ
QUNFX0ZJUlNUX0lEICsgMSk7CisKKwkJCWZpbF9vcGVuX2xvZ19hbmRfc3lzdGVtX3RhYmxlc3Bh
Y2VfZmlsZXMoKTsKKworCQkJLyogQ3JlYXRlIGEgbG9nIGNoZWNrcG9pbnQuICovCisJCQltdXRl
eF9lbnRlcigmbG9nX3N5cy0+bXV0ZXgpOworCQkJdXRfZChyZWN2X25vX2xvZ193cml0ZSA9IEZB
TFNFKTsKKwkJCXV0X2FkKG1heF9mbHVzaGVkX2xzbiA9PSBsb2dfc3lzLT5sc24pOworCQkJcmVj
dl9yZXNldF9sb2dzKG1heF9mbHVzaGVkX2xzbiwgVFJVRSk7CisJCQltdXRleF9leGl0KCZsb2df
c3lzLT5tdXRleCk7CisKKwkJCWliX2xvZ2YoSUJfTE9HX0xFVkVMX1dBUk4sCisJCQkJIk5ldyBs
b2cgZmlsZXMgY3JlYXRlZCIKKwkJCQkiLCBMU049IiBMU05fUEYsCisJCQkJbWF4X2ZsdXNoZWRf
bHNuKTsKKwkJfQorCiAJCXNydl9zdGFydHVwX2lzX2JlZm9yZV90cnhfcm9sbGJhY2tfcGhhc2Ug
PSBGQUxTRTsKIAkJcmVjdl9yZWNvdmVyeV9yb2xsYmFja19hY3RpdmUoKTsKIAoKTm8gYnVuZGxl
IChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=