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

IDQzMDcgTWFya28gTcOka2Vsw6QJMjAxMi0wOS0yMQogICAgICBXTCM2NDk0IGVycm9yIGxvZyBj
bGVhbnVwOgogICAgICBjcmVhdGVfbG9nX2ZpbGUoKTogVXNlIGliX2xvZ2YoKSBmb3IgZGlhZ25v
c3RpY3MuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFy
dC5jYwogNDMwNiBNYXJrbyBNw6RrZWzDpAkyMDEyLTA5LTIxCiAgICAgIFdMIzY0OTQgY2xlYW4t
dXAuCiAgICAgIAogICAgICBmaWxfbm9kZV9jcmVhdGUoKTogUmV0dXJuIHRoZSBjcmVhdGVkIGZp
bGUgbmFtZSwgb3IgTlVMTCBvbiBlcnJvci4KICAgICAgQ2hlY2sgdGhlIGVycm9yIHN0YXR1cyBp
biBhbGwgY2FsbGVycy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9maWwv
ZmlsMGZpbC5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZmlsMGZpbC5oCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jYwogNDMwNSBNYXJrbyBNw6RrZWzDpAky
MDEyLTA5LTIxCiAgICAgIFdMIzY0OTQ6IE1ha2UgaW5ub2RiX2xvZ19maWxlX3NpemU9NDhNIHRo
ZSBuZXcgZGVmYXVsdC4KICAgICAgCiAgICAgIG15c3FsLXRlc3QtcnVuOiBFeHBsaWNpdGx5IHNw
ZWNpZnkgdGhlIG9sZCBkZWZhdWx0IGlubm9kYl9sb2dfZmlsZV9zaXplPTVNLgogICAgICBUaGlz
IGNhbiBiZSBvdmVycmlkZGVuIGJ5IC0tbXlzcWxkPS0taW5ub2RiLWxvZy1maWxlLXNpemU9NDhN
LgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L215c3FsLXRlc3QtcnVuLnBsCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuY2MKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
ZmlsL2ZpbDBmaWwuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA5MjEwNzMw
NDctbDBqbDEyNTEwNWZ4YjJ2NgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2ZpbC9maWwwZmlsLmNj
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTIxMTA1MjA5LWdhbWU4M2N1ZHJy
OGNxMjcKQEAgLTYxOCw5ICs2MTgsMTAgQEAgZmlsX3NwYWNlX2lzX2ZsdXNoZWQoCiB9CiAKIC8q
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqLy8qKgotQXBwZW5kcyBhIG5ldyBmaWxlIHRvIHRoZSBjaGFpbiBvZiBmaWxlcyBv
ZiBhIHNwYWNlLiBGaWxlIG11c3QgYmUgY2xvc2VkLiAqLworQXBwZW5kcyBhIG5ldyBmaWxlIHRv
IHRoZSBjaGFpbiBvZiBmaWxlcyBvZiBhIHNwYWNlLiBGaWxlIG11c3QgYmUgY2xvc2VkLgorQHJl
dHVybiBwb2ludGVyIHRvIHRoZSBmaWxlIG5hbWUsIG9yIE5VTEwgb24gZXJyb3IgKi8KIFVOSVZf
SU5URVJOCi12b2lkCitjaGFyKgogZmlsX25vZGVfY3JlYXRlKAogLyo9PT09PT09PT09PT0qLwog
CWNvbnN0IGNoYXIqCW5hbWUsCS8qITwgaW46IGZpbGUgbmFtZSAoZmlsZSBtdXN0IGJlIGNsb3Nl
ZCkgKi8KQEAgLTY2Myw3ICs2NjQsNyBAQCBmaWxfbm9kZV9jcmVhdGUoCiAKIAkJbXV0ZXhfZXhp
dCgmZmlsX3N5c3RlbS0+bXV0ZXgpOwogCi0JCXJldHVybjsKKwkJcmV0dXJuKE5VTEwpOwogCX0K
IAogCXNwYWNlLT5zaXplICs9IHNpemU7CkBAIC02NzgsNiArNjc5LDggQEAgZmlsX25vZGVfY3Jl
YXRlKAogCX0KIAogCW11dGV4X2V4aXQoJmZpbF9zeXN0ZW0tPm11dGV4KTsKKworCXJldHVybihu
b2RlLT5uYW1lKTsKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgpAQCAtMzM4MywxMyArMzM4NiwxMSBA
QCBmaWxfY3JlYXRlX25ld19zaW5nbGVfdGFibGVfdGFibGVzcGFjZSgKIAl9CiAKIAlzdWNjZXNz
ID0gZmlsX3NwYWNlX2NyZWF0ZSh0YWJsZW5hbWUsIHNwYWNlX2lkLCBmbGFncywgRklMX1RBQkxF
U1BBQ0UpOwotCWlmICghc3VjY2VzcykgeworCWlmICghc3VjY2VzcyB8fCAhZmlsX25vZGVfY3Jl
YXRlKHBhdGgsIHNpemUsIHNwYWNlX2lkLCBGQUxTRSkpIHsKIAkJZXJyID0gREJfRVJST1I7CiAJ
CWdvdG8gZXJyb3JfZXhpdF8xOwogCX0KIAotCWZpbF9ub2RlX2NyZWF0ZShwYXRoLCBzaXplLCBz
cGFjZV9pZCwgRkFMU0UpOwotCiAjaWZuZGVmIFVOSVZfSE9UQkFDS1VQCiAJewogCQltdHJfdAkJ
bXRyOwpAQCAtMzgwNSw5ICszODA2LDExIEBAIHNraXBfdmFsaWRhdGU6CiAJCS8qIFdlIGRvIG5v
dCBtZWFzdXJlIHRoZSBzaXplIG9mIHRoZSBmaWxlLCB0aGF0IGlzIHdoeQogCQl3ZSBwYXNzIHRo
ZSAwIGJlbG93ICovCiAKLQkJZmlsX25vZGVfY3JlYXRlKHJlbW90ZS5zdWNjZXNzID8gcmVtb3Rl
LmZpbGVwYXRoIDoKLQkJCQlkaWN0LnN1Y2Nlc3MgPyBkaWN0LmZpbGVwYXRoIDoKLQkJCQlkZWYu
ZmlsZXBhdGgsIDAsIGlkLCBGQUxTRSk7CisJCWlmICghZmlsX25vZGVfY3JlYXRlKHJlbW90ZS5z
dWNjZXNzID8gcmVtb3RlLmZpbGVwYXRoIDoKKwkJCQkgICAgIGRpY3Quc3VjY2VzcyA/IGRpY3Qu
ZmlsZXBhdGggOgorCQkJCSAgICAgZGVmLmZpbGVwYXRoLCAwLCBpZCwgRkFMU0UpKSB7CisJCQll
cnIgPSBEQl9FUlJPUjsKKwkJfQogCX0KIAogY2xlYW51cF9hbmRfZXhpdDoKQEAgLTQxODksNyAr
NDE5Miw5IEBAIHdpbGxfbm90X2Nob29zZToKIAl0aGUgcm91bmRpbmcgZm9ybXVsYSBmb3IgZXh0
ZW50cyBhbmQgcGFnZXMgaXMgc29tZXdoYXQgY29tcGxleDsgd2UKIAlsZXQgZmlsX25vZGVfb3Bl
bigpIGRvIHRoYXQgdGFzay4gKi8KIAotCWZpbF9ub2RlX2NyZWF0ZShmc3AtPmZpbGVwYXRoLCAw
LCBmc3AtPmlkLCBGQUxTRSk7CisJaWYgKCFmaWxfbm9kZV9jcmVhdGUoZnNwLT5maWxlcGF0aCwg
MCwgZnNwLT5pZCwgRkFMU0UpKSB7CisJCXV0X2Vycm9yOworCX0KIAogZnVuY19leGl0OgogCW9z
X2ZpbGVfY2xvc2UoZnNwLT5maWxlKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvZmlsMGZpbC5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZmls
MGZpbC5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTIxMDczMDQ3LWwwamwx
MjUxMDVmeGIydjYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2ZpbDBmaWwuaAlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDkyMTEwNTIwOS1nYW1lODNjdWRycjhjcTI3
CkBAIC0xOTksMTcgKzE5OSwxOSBAQCBmaWxfc3BhY2VfZ2V0X3R5cGUoCiAJdWxpbnQJaWQpOwkv
KiE8IGluOiBzcGFjZSBpZCAqLwogI2VuZGlmIC8qICFVTklWX0hPVEJBQ0tVUCAqLwogLyoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKiovLyoqCi1BcHBlbmRzIGEgbmV3IGZpbGUgdG8gdGhlIGNoYWluIG9mIGZpbGVzIG9mIGEg
c3BhY2UuIEZpbGUgbXVzdCBiZSBjbG9zZWQuICovCitBcHBlbmRzIGEgbmV3IGZpbGUgdG8gdGhl
IGNoYWluIG9mIGZpbGVzIG9mIGEgc3BhY2UuIEZpbGUgbXVzdCBiZSBjbG9zZWQuCitAcmV0dXJu
IHBvaW50ZXIgdG8gdGhlIGZpbGUgbmFtZSwgb3IgTlVMTCBvbiBlcnJvciAqLwogVU5JVl9JTlRF
Uk4KLXZvaWQKK2NoYXIqCiBmaWxfbm9kZV9jcmVhdGUoCiAvKj09PT09PT09PT09PSovCiAJY29u
c3QgY2hhcioJbmFtZSwJLyohPCBpbjogZmlsZSBuYW1lIChmaWxlIG11c3QgYmUgY2xvc2VkKSAq
LwogCXVsaW50CQlzaXplLAkvKiE8IGluOiBmaWxlIHNpemUgaW4gZGF0YWJhc2UgYmxvY2tzLCBy
b3VuZGVkCiAJCQkJZG93bndhcmRzIHRvIGFuIGludGVnZXIgKi8KIAl1bGludAkJaWQsCS8qITwg
aW46IHNwYWNlIGlkIHdoZXJlIHRvIGFwcGVuZCAqLwotCWlib29sCQlpc19yYXcpOy8qITwgaW46
IFRSVUUgaWYgYSByYXcgZGV2aWNlIG9yCisJaWJvb2wJCWlzX3JhdykJLyohPCBpbjogVFJVRSBp
ZiBhIHJhdyBkZXZpY2Ugb3IKIAkJCQlhIHJhdyBkaXNrIHBhcnRpdGlvbiAqLworCV9fYXR0cmli
dXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOwogI2lmZGVmIFVOSVZfTE9HX0FS
Q0hJVkUKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqLy8qKgogRHJvcHMgZmlsZXMgZnJvbSB0aGUgc3RhcnQgb2YgYSBmaWxl
IHNwYWNlLCBzbyB0aGF0IGl0cyBzaXplIGlzIGN1dCBieQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzdGFydC5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9z
cnYvc3J2MHN0YXJ0LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTIxMDcz
MDQ3LWwwamwxMjUxMDVmeGIydjYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0
LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwOTIxMTA1MjA5LWdhbWU4M2N1
ZHJyOGNxMjcKQEAgLTUyMSwzMCArNTIxLDE2IEBAIGNyZWF0ZV9sb2dfZmlsZSgKIAkJaW5ub2Ri
X2ZpbGVfbG9nX2tleSwgbmFtZSwKIAkJT1NfRklMRV9DUkVBVEUsIE9TX0ZJTEVfTk9STUFMLCBP
U19MT0dfRklMRSwgJnJldCk7CiAKLQl1dF9wcmludF90aW1lc3RhbXAoc3RkZXJyKTsKLQotCWZw
cmludGYoc3RkZXJyLAotCQkiIElubm9EQjogTG9nIGZpbGUgJXMgZGlkIG5vdCBleGlzdDoiCi0J
CSIgbmV3IHRvIGJlIGNyZWF0ZWRcbiIsCi0JCW5hbWUpOwotCi0JZnByaW50ZihzdGRlcnIsICJJ
bm5vREI6IFNldHRpbmcgbG9nIGZpbGUgJXMgc2l6ZSB0byAlbHUgTUJcbiIsCisJaWJfbG9nZihJ
Ql9MT0dfTEVWRUxfSU5GTywKKwkJIlNldHRpbmcgbG9nIGZpbGUgJXMgc2l6ZSB0byAlbHUgTUIi
LAogCQluYW1lLCAodWxvbmcpIHNydl9sb2dfZmlsZV9zaXplCiAJCT4+ICgyMCAtIFVOSVZfUEFH
RV9TSVpFX1NISUZUKSk7CiAKLQlmcHJpbnRmKHN0ZGVyciwKLQkJIklubm9EQjogRGF0YWJhc2Ug
cGh5c2ljYWxseSB3cml0ZXMgdGhlIGZpbGUiCi0JCSIgZnVsbDogd2FpdC4uLlxuIik7Ci0KIAly
ZXQgPSBvc19maWxlX3NldF9zaXplKG5hbWUsICpmaWxlLAogCQkJICAgICAgIChvc19vZmZzZXRf
dCkgc3J2X2xvZ19maWxlX3NpemUKIAkJCSAgICAgICA8PCBVTklWX1BBR0VfU0laRV9TSElGVCk7
CiAJaWYgKCFyZXQpIHsKLQkJZnByaW50ZihzdGRlcnIsCi0JCQkiSW5ub0RCOiBFcnJvciBpbiBj
cmVhdGluZyAlczoiCi0JCQkiIHByb2JhYmx5IG91dCBvZiBkaXNrIHNwYWNlXG4iLAotCQkJbmFt
ZSk7Ci0KKwkJaWJfbG9nZihJQl9MT0dfTEVWRUxfRVJST1IsICJFcnJvciBpbiBjcmVhdGluZyAl
cyIsIG5hbWUpOwogCQlyZXR1cm4oREJfRVJST1IpOwogCX0KIApAQCAtODk0LDggKzg4MCwxMCBA
QCBza2lwX3NpemVfY2hlY2s6CiAKIAkJdXRfYShmaWxfdmFsaWRhdGUoKSk7CiAKLQkJZmlsX25v
ZGVfY3JlYXRlKG5hbWUsIHNydl9kYXRhX2ZpbGVfc2l6ZXNbaV0sIDAsCi0JCQkJc3J2X2RhdGFf
ZmlsZV9pc19yYXdfcGFydGl0aW9uW2ldICE9IDApOworCQlpZiAoIWZpbF9ub2RlX2NyZWF0ZShu
YW1lLCBzcnZfZGF0YV9maWxlX3NpemVzW2ldLCAwLAorCQkJCSAgICAgc3J2X2RhdGFfZmlsZV9p
c19yYXdfcGFydGl0aW9uW2ldICE9IDApKSB7CisJCQlyZXR1cm4oREJfRVJST1IpOworCQl9CiAJ
fQogCiAJcmV0dXJuKERCX1NVQ0NFU1MpOwpAQCAtOTc2LDcgKzk2NCw3IEBAIHNydl91bmRvX3Rh
Ymxlc3BhY2Vfb3BlbigKIAl1bGludAkJc3BhY2UpCQkvKiE8IGluOiB0YWJsZXNwYWNlIGlkICov
CiB7CiAJb3NfZmlsZV90CWZoOwotCWRiZXJyX3QJCWVycjsKKwlkYmVycl90CQllcnIJPSBEQl9F
UlJPUjsKIAlpYm9vbAkJcmV0OwogCXVsaW50CQlmbGFnczsKIApAQCAtMTAyOSwxMSArMTAxNyw5
IEBAIHNydl91bmRvX3RhYmxlc3BhY2Vfb3BlbigKIAkJaXMgNjQgYml0LiBJdCBpcyBPSyB0byBj
YXN0IHRoZSBuX3BhZ2VzIHRvIHVsaW50IGJlY2F1c2UKIAkJdGhlIHVuaXQgaGFzIGJlZW4gc2Nh
bGVkIHRvIHBhZ2VzIGFuZCB0aGV5IGFyZSBhbHdheXMKIAkJMzIgYml0LiAqLwotCQlmaWxfbm9k
ZV9jcmVhdGUobmFtZSwgKHVsaW50KSBuX3BhZ2VzLCBzcGFjZSwgRkFMU0UpOwotCi0JCWVyciA9
IERCX1NVQ0NFU1M7Ci0JfSBlbHNlIHsKLQkJZXJyID0gREJfRVJST1I7CisJCWlmIChmaWxfbm9k
ZV9jcmVhdGUobmFtZSwgKHVsaW50KSBuX3BhZ2VzLCBzcGFjZSwgRkFMU0UpKSB7CisJCQllcnIg
PSBEQl9TVUNDRVNTOworCQl9CiAJfQogCiAJcmV0dXJuKGVycik7CkBAIC0xOTE1LDggKzE5MDEs
MTAgQEAgY3JlYXRlX2xvZ19maWxlczoKIAkJc3ByaW50Zihsb2dmaWxlbmFtZSArIGRpcm5hbWVs
ZW4sICJpYl9sb2dmaWxlJWx1IiwKIAkJCSh1bG9uZykgaik7CiAKLQkJZmlsX25vZGVfY3JlYXRl
KGxvZ2ZpbGVuYW1lLCAodWxpbnQpIHNydl9sb2dfZmlsZV9zaXplLAotCQkJCVNSVl9MT0dfU1BB
Q0VfRklSU1RfSUQsIEZBTFNFKTsKKwkJaWYgKCFmaWxfbm9kZV9jcmVhdGUobG9nZmlsZW5hbWUs
ICh1bGludCkgc3J2X2xvZ19maWxlX3NpemUsCisJCQkJICAgICBTUlZfTE9HX1NQQUNFX0ZJUlNU
X0lELCBGQUxTRSkpIHsKKwkJCXJldHVybihEQl9FUlJPUik7CisJCX0KIAl9CiAKICNpZmRlZiBV
TklWX0xPR19BUkNISVZFCkBAIC0yMjUwLDkgKzIyMzgsMTIgQEAgY3JlYXRlX2xvZ19maWxlczoK
IAkJCQlzcHJpbnRmKGxvZ2ZpbGVuYW1lICsgZGlybmFtZWxlbiwKIAkJCQkJImliX2xvZ2ZpbGUl
bHUiLCAodWxvbmcpIGkpOwogCi0JCQkJZmlsX25vZGVfY3JlYXRlKAotCQkJCQlsb2dmaWxlbmFt
ZSwgKHVsaW50KSBzcnZfbG9nX2ZpbGVfc2l6ZSwKLQkJCQkJU1JWX0xPR19TUEFDRV9GSVJTVF9J
RCwgRkFMU0UpOworCQkJCWlmICghZmlsX25vZGVfY3JlYXRlKAorCQkJCQkgICAgbG9nZmlsZW5h
bWUsCisJCQkJCSAgICAodWxpbnQpIHNydl9sb2dfZmlsZV9zaXplLAorCQkJCQkgICAgU1JWX0xP
R19TUEFDRV9GSVJTVF9JRCwgRkFMU0UpKSB7CisJCQkJCXV0X2Vycm9yOworCQkJCX0KIAkJCX0K
IAogCQkJbG9nX2dyb3VwX2luaXQoMCwgc3J2X25fbG9nX2ZpbGVzLAoKTm8gYnVuZGxlIChyZWFz
b246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=