From: marko.makela
Date: May 23 2012 1:43pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3856 to 3857) WL#6255
List-Archive: http://lists.mysql.com/commits/143926
Message-Id: <201205231343.q4NDhIaa022984@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NTcgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yMwogICAgICBXTCM2MjU1IHByZXBhcmF0aW9u
OiBBZGQgdGhlIGFjY2Vzc29yIHRyeF91bmRvX3RyeF9pZF9pc19pbnNlcnQoKS4KCiAgICBtb2Rp
ZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB1bmRvLmgKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB1bmRvLmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzBtZXJnZS5jYwogMzg1NiBNYXJrbyBNw6RrZWzDpAkyMDEyLTA1LTIzCiAgICAgIFJl
bW92ZSBib2d1cyBfX2F0dHJpYnV0ZV9fKChwdXJlKSkgb24gaW5kZXhlcy4KICAgICAgCiAgICAg
IEFuIGluZGV4IGNhbiBiZWNvbWUgY29ycnVwdGVkIGJldHdlZW4gY2FsbHMgb3IgaXRzIG9ubGlu
ZV9zdGF0dXMgbWF5CiAgICAgIGNoYW5nZSBiZXR3ZWVuIGNhbGxzLgoKICAgIG1vZGlmaWVkOgog
ICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBkaWN0LmgKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwdW5kby5oJwotLS0gYS9zdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvdHJ4MHVuZG8uaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEyMDUyMzExNDUzMC03cHVudmZoc3dxbTgydHZjCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS90cngwdW5kby5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTIzMTM0
MjE0LTl3cDkyOHdkbXYwazgyaGsKQEAgLTY1LDYgKzY1LDE1IEBAIGlib29sCiB0cnhfdW5kb19y
b2xsX3B0cl9pc19pbnNlcnQoCiAvKj09PT09PT09PT09PT09PT09PT09PT09PSovCiAJcm9sbF9w
dHJfdAlyb2xsX3B0cik7CS8qITwgaW46IHJvbGwgcG9pbnRlciAqLworLyoqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ly8qKgorUmV0dXJucyB0cnVlIGlmIHRoZSByZWNvcmQgaXMgb2YgdGhlIGluc2VydCB0eXBlLgor
QHJldHVybgl0cnVlIGlmIHRoZSByZWNvcmQgd2FzIGZyZXNobHkgaW5zZXJ0ZWQgKG5vdCB1cGRh
dGVkKS4gKi8KK1VOSVZfSU5MSU5FCitib29sCit0cnhfdW5kb190cnhfaWRfaXNfaW5zZXJ0KAor
Lyo9PT09PT09PT09PT09PT09PT09PT09Ki8KKwljb25zdCBieXRlKgl0cnhfaWQpCS8qITwgaW46
IERCX1RSWF9JRCwgZm9sbG93ZWQgYnkgREJfUk9MTF9QVFIgKi8KKwlfX2F0dHJpYnV0ZV9fKChu
b25udWxsLCBwdXJlLCB3YXJuX3VudXNlZF9yZXN1bHQpKTsKICNlbmRpZiAvKiAhVU5JVl9IT1RC
QUNLVVAgKi8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKi8vKioKIFdyaXRlcyBhIHJvbGwgcHRyIHRvIGFuIGluZGV4IHBh
Z2UuIEluIGNhc2UgdGhhdCB0aGUgc2l6ZSBjaGFuZ2VzIGluCgo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB1bmRvLmljJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvdHJ4MHVuZG8uaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MjA1MjMxMTQ1MzAtN3B1bnZmaHN3cW04MnR2YworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvdHJ4MHVuZG8uaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjMxMzQy
MTQtOXdwOTI4d2RtdjBrODJoawpAQCAtMTAxLDYgKzEwMSwyMSBAQCB0cnhfdW5kb19yb2xsX3B0
cl9pc19pbnNlcnQoCiAJdXRfYWQocm9sbF9wdHIgPCAoMVVMTCA8PCA1NikpOwogCXJldHVybigo
aWJvb2wpIChyb2xsX3B0ciA+PiA1NSkpOwogfQorCisvKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCitSZXR1
cm5zIHRydWUgaWYgdGhlIHJlY29yZCBpcyBvZiB0aGUgaW5zZXJ0IHR5cGUuCitAcmV0dXJuCXRy
dWUgaWYgdGhlIHJlY29yZCB3YXMgZnJlc2hseSBpbnNlcnRlZCAobm90IHVwZGF0ZWQpLiAqLwor
VU5JVl9JTkxJTkUKK2Jvb2wKK3RyeF91bmRvX3RyeF9pZF9pc19pbnNlcnQoCisvKj09PT09PT09
PT09PT09PT09PT09PT0qLworCWNvbnN0IGJ5dGUqCXRyeF9pZCkJLyohPCBpbjogREJfVFJYX0lE
LCBmb2xsb3dlZCBieSBEQl9ST0xMX1BUUiAqLworeworI2lmIERBVEFfVFJYX0lEICsgMSAhPSBE
QVRBX1JPTExfUFRSCisjIGVycm9yCisjZW5kaWYKKwlyZXR1cm4oc3RhdGljX2Nhc3Q8Ym9vbD4o
dHJ4X2lkW0RBVEFfVFJYX0lEX0xFTl0gPj4gNykpOworfQogI2VuZGlmIC8qICFVTklWX0hPVEJB
Q0tVUCAqLwogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKiovLyoqCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9yb3cvcm93MG1lcmdlLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbWVy
Z2UuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjMxMTQ1MzAtN3B1bnZm
aHN3cW04MnR2YworKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbWVyZ2UuY2MJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjMxMzQyMTQtOXdwOTI4d2RtdjBrODJoawpA
QCAtMTQ1MSw3ICsxNDUxLDYgQEAgcm93X21lcmdlX3JlYWRfY2x1c3RlcmVkX2luZGV4KAogCQlp
ZiAoVU5JVl9MSUtFTFlfTlVMTChyZWNfb2Zmc19hbnlfbnVsbF9leHRlcm4ocmVjLCBvZmZzZXRz
KSkpIHsKICNpZiBkZWZpbmVkIFVOSVZfREVCVUcgfHwgZGVmaW5lZCBVTklWX0JMT0JfTElHSFRf
REVCVUcKIAkJCXRyeF9pZF90CXRyeF9pZDsKLQkJCXJvbGxfcHRyX3QJcm9sbF9wdHI7CiAJCQl1
bGludAkJdHJ4X2lkX29mZnNldDsKIAogCQkJLyogSXQgaXMgcG9zc2libGUgdGhhdCB0aGUgcmVj
b3JkIHdhcwpAQCAtMTQ2OCwxMCArMTQ2Nyw4IEBAIHJvd19tZXJnZV9yZWFkX2NsdXN0ZXJlZF9p
bmRleCgKIAkJCX0KIAogCQkJdHJ4X2lkID0gdHJ4X3JlYWRfdHJ4X2lkKHJlYyArIHRyeF9pZF9v
ZmZzZXQpOwotCQkJcm9sbF9wdHIgPSB0cnhfcmVhZF9yb2xsX3B0cihyZWMgKyB0cnhfaWRfb2Zm
c2V0Ci0JCQkJCQkgICAgICsgREFUQV9UUlhfSURfTEVOKTsKIAkJCXV0X2EodHJ4X3J3X2lzX2Fj
dGl2ZSh0cnhfaWQsIE5VTEwpKTsKLQkJCXV0X2EodHJ4X3VuZG9fcm9sbF9wdHJfaXNfaW5zZXJ0
KHJvbGxfcHRyKSk7CisJCQl1dF9hKHRyeF91bmRvX3RyeF9pZF9pc19pbnNlcnQocmVjICsgdHJ4
X2lkX29mZnNldCkpOwogI2VuZGlmIC8qIFVOSVZfREVCVUcgfHwgVU5JVl9CTE9CX0xJR0hUX0RF
QlVHICovCiAKIAkJCS8qIFdoZW4gIW9ubGluZSwgd2UgYXJlIGhvbGRpbmcgYW4gWC1sb2NrIG9u
CgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==