From: marko.makela
Date: November 8 2011 2:15pm
Subject: bzr push into mysql-trunk branch (marko.makela:3458 to 3460)
List-Archive: http://lists.mysql.com/commits/141869
Message-Id: <201111081415.pA8EFMbp001870@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM0NjAgTWFya28gTcOka2Vsw6QJMjAxMS0xMS0wOAogICAgICBldmFsX2Z1bmMoKTogUmVwbGFj
ZSBpZi1lbHNlIHdpdGggc3dpdGNoLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9i
YXNlL2V2YWwvZXZhbDBldmFsLmNjCiAzNDU5IE1hcmtvIE3DpGtlbMOkCTIwMTEtMTEtMDgKICAg
ICAgQWRkIHdoaXRlIHNwYWNlIGFyb3VuZCBVSU5UNjRQRiBhY2NvcmRpbmcgdG8gb3VyIGNvbnZl
bnRpb24uCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvb3Mvb3MwZmlsZS5j
YwogMzQ1OCBNYXJrbyBNw6RrZWzDpAkyMDExLTExLTA4CiAgICAgIFVwZGF0ZSBjb3B5cmlnaHQg
bWVzc2FnZXMuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzBs
b2cuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9sb2cvbG9nMHJlY3YuY2MKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9tZW0vbWVtMGRiZy5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL21lbS9tZW0w
cG9vbC5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL29zL29zMGZpbGUuY2MKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9vcy9vczBwcm9jLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvb3Mvb3Mwc3lu
Yy5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL29zL29zMHRocmVhZC5jYwogICAgICBzdG9yYWdl
L2lubm9iYXNlL3BhcnMvbGV4eXkuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9wYXJzL3BhcnMw
Z3JtLnkKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9wYXJzL3BhcnMwbGV4LmwKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9wYXJzL3BhcnMwb3B0LmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvcGFycy9w
YXJzMHN5bS5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwZXh0LmNjCiAgICAgIHN0
b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1bmRvLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2
L3NydjBtb24uY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHN0YXJ0LmNjCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvdXNyL3VzcjBzZXNzLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
dXQvdXQwbGlzdC5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3V0L3V0MHZlYy5jYwogICAgICBz
dG9yYWdlL2lubm9iYXNlL3V0L3V0MHdxdWV1ZS5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9ldmFsL2V2YWwwZXZhbC5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9ldmFs
L2V2YWwwZXZhbC5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMTEwODEyMjc1
Ni05YWs2bm1hb2RrbHk2b2N0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvZXZhbC9ldmFsMGV2YWwu
Y2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMDgxNDE0MjctMHM5c3k0YWVk
dXdkdGw5ZwpAQCAtODE0LDM0ICs4MTQsNDcgQEAgZXZhbF9mdW5jKAogCQlhcmcgPSBxdWVfbm9k
ZV9nZXRfbmV4dChhcmcpOwogCX0KIAotCWlmIChmY2xhc3MgPT0gUEFSU19GVU5DX0NNUCkgewor
CXN3aXRjaCAoZmNsYXNzKSB7CisJY2FzZSBQQVJTX0ZVTkNfQ01QOgogCQlldmFsX2NtcChmdW5j
X25vZGUpOwotCX0gZWxzZSBpZiAoZmNsYXNzID09IFBBUlNfRlVOQ19BUklUSCkgeworCQlyZXR1
cm47CisJY2FzZSBQQVJTX0ZVTkNfQVJJVEg6CiAJCWV2YWxfYXJpdGgoZnVuY19ub2RlKTsKLQl9
IGVsc2UgaWYgKGZjbGFzcyA9PSBQQVJTX0ZVTkNfQUdHUkVHQVRFKSB7CisJCXJldHVybjsKKwlj
YXNlIFBBUlNfRlVOQ19BR0dSRUdBVEU6CiAJCWV2YWxfYWdncmVnYXRlKGZ1bmNfbm9kZSk7Ci0J
fSBlbHNlIGlmIChmY2xhc3MgPT0gUEFSU19GVU5DX1BSRURFRklORUQpIHsKLQotCQlpZiAoZnVu
YyA9PSBQQVJTX05PVEZPVU5EX1RPS0VOKSB7CisJCXJldHVybjsKKwljYXNlIFBBUlNfRlVOQ19Q
UkVERUZJTkVEOgorCQlzd2l0Y2ggKGZ1bmMpIHsKKwkJY2FzZSBQQVJTX05PVEZPVU5EX1RPS0VO
OgogCQkJZXZhbF9ub3Rmb3VuZChmdW5jX25vZGUpOwotCQl9IGVsc2UgaWYgKGZ1bmMgPT0gUEFS
U19TVUJTVFJfVE9LRU4pIHsKKwkJCXJldHVybjsKKwkJY2FzZSBQQVJTX1NVQlNUUl9UT0tFTjoK
IAkJCWV2YWxfc3Vic3RyKGZ1bmNfbm9kZSk7Ci0JCX0gZWxzZSBpZiAoZnVuYyA9PSBQQVJTX1JF
UExTVFJfVE9LRU4pIHsKKwkJCXJldHVybjsKKwkJY2FzZSBQQVJTX1JFUExTVFJfVE9LRU46CiAJ
CQlldmFsX3JlcGxzdHIoZnVuY19ub2RlKTsKLQkJfSBlbHNlIGlmIChmdW5jID09IFBBUlNfSU5T
VFJfVE9LRU4pIHsKKwkJCXJldHVybjsKKwkJY2FzZSBQQVJTX0lOU1RSX1RPS0VOOgogCQkJZXZh
bF9pbnN0cihmdW5jX25vZGUpOwotCQl9IGVsc2UgaWYgKGZ1bmMgPT0gUEFSU19CSU5BUllfVE9f
TlVNQkVSX1RPS0VOKSB7CisJCQlyZXR1cm47CisJCWNhc2UgUEFSU19CSU5BUllfVE9fTlVNQkVS
X1RPS0VOOgogCQkJZXZhbF9iaW5hcnlfdG9fbnVtYmVyKGZ1bmNfbm9kZSk7Ci0JCX0gZWxzZSBp
ZiAoZnVuYyA9PSBQQVJTX0NPTkNBVF9UT0tFTikgeworCQkJcmV0dXJuOworCQljYXNlIFBBUlNf
Q09OQ0FUX1RPS0VOOgogCQkJZXZhbF9jb25jYXQoZnVuY19ub2RlKTsKLQkJfSBlbHNlIGlmIChm
dW5jID09IFBBUlNfVE9fQklOQVJZX1RPS0VOKSB7CisJCQlyZXR1cm47CisJCWNhc2UgUEFSU19U
T19CSU5BUllfVE9LRU46CiAJCQlldmFsX3RvX2JpbmFyeShmdW5jX25vZGUpOwotCQl9IGVsc2Ug
eworCQkJcmV0dXJuOworCQlkZWZhdWx0OgogCQkJZXZhbF9wcmVkZWZpbmVkKGZ1bmNfbm9kZSk7
CisJCQlyZXR1cm47CiAJCX0KLQl9IGVsc2UgewotCQl1dF9hZChmY2xhc3MgPT0gUEFSU19GVU5D
X0xPR0lDQUwpOwotCisJY2FzZSBQQVJTX0ZVTkNfTE9HSUNBTDoKIAkJZXZhbF9sb2dpY2FsKGZ1
bmNfbm9kZSk7CisJCXJldHVybjsKIAl9CisKKwl1dF9lcnJvcjsKIH0KCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9iYXNlL29zL29zMGZpbGUuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2Uvb3Mvb3MwZmlsZS5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMTEwODEy
Mjc1Ni05YWs2bm1hb2RrbHk2b2N0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvb3Mvb3MwZmlsZS5j
YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMTEwODE0MTQyNy0wczlzeTRhZWR1
d2R0bDlnCkBAIC00ODk3LDggKzQ4OTcsOCBAQCBjb25zZWN1dGl2ZV9sb29wOgogCiAJaWYgKG9z
X2Fpb19wcmludF9kZWJ1ZykgewogCQlmcHJpbnRmKHN0ZGVyciwKLQkJCSJJbm5vREI6IGRvaW5n
IGkvbyBvZiB0eXBlICVsdSBhdCBvZmZzZXQgIlVJTlQ2NFBGIiwiCi0JCQkiIGxlbmd0aCAlbHVc
biIsCisJCQkiSW5ub0RCOiBkb2luZyBpL28gb2YgdHlwZSAlbHUgYXQgb2Zmc2V0ICIgVUlOVDY0
UEYKKwkJCSIsIGxlbmd0aCAlbHVcbiIsCiAJCQkodWxvbmcpIHNsb3QtPnR5cGUsIHNsb3QtPm9m
ZnNldCwgKHVsb25nKSB0b3RhbF9sZW4pOwogCX0KIAoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxl
c3MgZm9yIHB1c2ggZW1haWxzKS4=