From: marko.makela
Date: June 21 2012 5:17am
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:4012 to 4013) WL#6255
List-Archive: http://lists.mysql.com/commits/144279
Message-Id: <20120621051746.3840.30862.4013@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQwMTMgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0yMQogICAgICBXTCM2MjU1IHJldmlldyBmaXhl
cy4KICAgICAgCiAgICAgIEFkanVzdCB0aGUgY29tbWVudHMgb2Ygcm93X21lcmdlX2R1cF90IHdo
ZW4gaXQgaXMgbm90IGJlaW5nIHVzZWQgZm9yCiAgICAgIGRldGVjdGluZyBhbmQgcmVwb3J0aW5n
IGR1cGxpY2F0ZXMsIGJ1dCByYXRoZXIgYXMgYSBjb2xsZWN0aW9uIG9mCiAgICAgIGRhdGEgc3Ry
dWN0dXJlcyByZWxhdGVkIHRvIGNyZWF0aW5nIGFuIGluZGV4IG9yIHJlYnVpbGRpbmcgYSB0YWJs
ZS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzBmdHNv
cnQuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MG1lcmdlLmgKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MGZ0c29ydC5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jv
dy9yb3cwbWVyZ2UuY2MKIDQwMTIgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0yMQogICAgICBXTCM2
MjU1IGRlYWQgY29kZSByZW1vdmFsLgogICAgICAKICAgICAgcm93X3JlY190b19pbmRleF9lbnRy
eSgpOiBSZW1vdmUgdGhlIGNvbnN0YW50IHBhcmFtZXRlciB0eXBlPVJPV19DT1BZX0RBVEEuCgog
ICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzByb3cuaAogICAgICBzdG9yYWdlL2lubm9iYXNl
L3Jvdy9yb3cwbXlzcWwuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jYwog
ICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdXBkLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2UvdHJ4L3RyeDByZWMuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS9yb3cwZnRzb3J0LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwZnRz
b3J0LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA2MjAyMTE1MTQtODZsOG01
Ynlhc2UyazJvdworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MGZ0c29ydC5oCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjIxMDUxNjM0LWloZnEzZmRmbXZ5OTQ0
YTUKQEAgLTYwLDcgKzYwLDcgQEAgc3RydWN0IGZ0c19wc29ydF90OwogCiAvKiogQ29tbW9uIGlu
Zm8gcGFzc2VkIHRvIGVhY2ggcGFyYWxsZWwgc29ydCB0aHJlYWQgKi8KIHN0cnVjdCBmdHNfcHNv
cnRfY29tbW9uX3QgewotCXJvd19tZXJnZV9kdXBfdCoJZHVwOwkJLyohPCBGVFMgaW5kZXggKi8K
Kwlyb3dfbWVyZ2VfZHVwX3QqCWR1cDsJCS8qITwgZGVzY3JpcHRvciBvZiBGVFMgaW5kZXggKi8K
IAlkaWN0X3RhYmxlX3QqCQluZXdfdGFibGU7CS8qITwgc291cmNlIHRhYmxlICovCiAJdHJ4X3Qq
CQkJdHJ4OwkJLyohPCB0cmFuc2FjdGlvbiAqLwogCWZ0c19wc29ydF90KgkJYWxsX2luZm87CS8q
ITwgYWxsIHBhcmFsbGVsIHNvcnQgaW5mbyAqLwpAQCAtMTY4LDcgKzE2OCw4IEBAIGlib29sCiBy
b3dfZnRzX3Bzb3J0X2luZm9faW5pdCgKIC8qPT09PT09PT09PT09PT09PT09PT0qLwogCXRyeF90
KgkJCXRyeCwJLyohPCBpbjogdHJhbnNhY3Rpb24gKi8KLQlyb3dfbWVyZ2VfZHVwX3QqCWR1cCwJ
LyohPCBpbixvd246IEZUUyBpbmRleCBiZWluZyBjcmVhdGVkICovCisJcm93X21lcmdlX2R1cF90
KglkdXAsCS8qITwgaW4sb3duOiBkZXNjcmlwdG9yIG9mCisJCQkJCUZUUyBpbmRleCBiZWluZyBj
cmVhdGVkICovCiAJY29uc3QgZGljdF90YWJsZV90KgluZXdfdGFibGUsLyohPCBpbjogdGFibGUg
d2hlcmUgaW5kZXhlcyBhcmUKIAkJCQkJY3JlYXRlZCAqLwogCWlib29sCQkJb3B0X2RvY19pZF9z
aXplLAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwbWVy
Z2UuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzBtZXJnZS5oCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjIwMjExNTE0LTg2bDhtNWJ5YXNlMmsyb3cKKysr
IGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzBtZXJnZS5oCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTIwNjIxMDUxNjM0LWloZnEzZmRmbXZ5OTQ0YTUKQEAgLTM3NSw3ICsz
NzUsOCBAQCBkYmVycl90CiByb3dfbWVyZ2Vfc29ydCgKIC8qPT09PT09PT09PT0qLwogCXRyeF90
KgkJCXRyeCwJLyohPCBpbjogdHJhbnNhY3Rpb24gKi8KLQljb25zdCByb3dfbWVyZ2VfZHVwX3Qq
CWR1cCwJLyohPCBpbjogaW5kZXggYmVpbmcgY3JlYXRlZCAqLworCWNvbnN0IHJvd19tZXJnZV9k
dXBfdCoJZHVwLAkvKiE8IGluOiBkZXNjcmlwdG9yIG9mCisJCQkJCWluZGV4IGJlaW5nIGNyZWF0
ZWQgKi8KIAltZXJnZV9maWxlX3QqCQlmaWxlLAkvKiE8IGluL291dDogZmlsZSBjb250YWluaW5n
CiAJCQkJCWluZGV4IGVudHJpZXMgKi8KIAlyb3dfbWVyZ2VfYmxvY2tfdCoJYmxvY2ssCS8qITwg
aW4vb3V0OiAzIGJ1ZmZlcnMgKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNl
L3Jvdy9yb3cwZnRzb3J0LmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwZnRzb3J0
LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjIwMjExNTE0LTg2bDhtNWJ5
YXNlMmsyb3cKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGZ0c29ydC5jYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDYyMTA1MTYzNC1paGZxM2ZkZm12eTk0NGE1CkBA
IC0xNzEsNyArMTcxLDggQEAgaWJvb2wKIHJvd19mdHNfcHNvcnRfaW5mb19pbml0KAogLyo9PT09
PT09PT09PT09PT09PT09PSovCiAJdHJ4X3QqCQkJdHJ4LAkvKiE8IGluOiB0cmFuc2FjdGlvbiAq
LwotCXJvd19tZXJnZV9kdXBfdCoJZHVwLAkvKiE8IGluLG93bjogRlRTIGluZGV4IGJlaW5nIGNy
ZWF0ZWQgKi8KKwlyb3dfbWVyZ2VfZHVwX3QqCWR1cCwJLyohPCBpbixvd246IGRlc2NyaXB0b3Ig
b2YKKwkJCQkJRlRTIGluZGV4IGJlaW5nIGNyZWF0ZWQgKi8KIAljb25zdCBkaWN0X3RhYmxlX3Qq
CW5ld190YWJsZSwvKiE8IGluOiB0YWJsZSBvbiB3aGljaCBpbmRleGVzIGFyZQogCQkJCQljcmVh
dGVkICovCiAJaWJvb2wJCQlvcHRfZG9jX2lkX3NpemUsCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdlLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jv
dy9yb3cwbWVyZ2UuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA2MjAyMTE1
MTQtODZsOG01Ynlhc2UyazJvdworKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbWVyZ2Uu
Y2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA2MjEwNTE2MzQtaWhmcTNmZGZt
dnk5NDRhNQpAQCAtMTgwMiw3ICsxODAyLDggQEAgc3RhdGljIF9fYXR0cmlidXRlX18oKG5vbm51
bGwsIHdhcm5fdW51cwogZGJlcnJfdAogcm93X21lcmdlX2Jsb2NrcygKIC8qPT09PT09PT09PT09
PSovCi0JY29uc3Qgcm93X21lcmdlX2R1cF90KglkdXAsCS8qITwgaW46IGluZGV4IGJlaW5nIGNy
ZWF0ZWQgKi8KKwljb25zdCByb3dfbWVyZ2VfZHVwX3QqCWR1cCwJLyohPCBpbjogZGVzY3JpcHRv
ciBvZgorCQkJCQlpbmRleCBiZWluZyBjcmVhdGVkICovCiAJdWxpbnQJCQluX251bGwsCS8qITwg
aW46IHNpemUgb2YgdGhlIE5VTEwtYml0IGJpdG1hcCAqLwogCWNvbnN0IG1lcmdlX2ZpbGVfdCoJ
ZmlsZSwJLyohPCBpbjogZmlsZSBjb250YWluaW5nCiAJCQkJCWluZGV4IGVudHJpZXMgKi8KQEAg
LTE5ODgsNyArMTk4OSw4IEBAIGRiZXJyX3QKIHJvd19tZXJnZSgKIC8qPT09PT09Ki8KIAl0cnhf
dCoJCQl0cngsCS8qITwgaW46IHRyYW5zYWN0aW9uICovCi0JY29uc3Qgcm93X21lcmdlX2R1cF90
KglkdXAsCS8qITwgaW46IGluZGV4IGJlaW5nIGNyZWF0ZWQgKi8KKwljb25zdCByb3dfbWVyZ2Vf
ZHVwX3QqCWR1cCwJLyohPCBpbjogZGVzY3JpcHRvciBvZgorCQkJCQlpbmRleCBiZWluZyBjcmVh
dGVkICovCiAJdWxpbnQJCQluX251bGwsCS8qITwgaW46IHNpemUgb2YgdGhlIE5VTEwtYml0IGJp
dG1hcCAqLwogCW1lcmdlX2ZpbGVfdCoJCWZpbGUsCS8qITwgaW4vb3V0OiBmaWxlIGNvbnRhaW5p
bmcKIAkJCQkJaW5kZXggZW50cmllcyAqLwpAQCAtMjExOCw3ICsyMTIwLDggQEAgZGJlcnJfdAog
cm93X21lcmdlX3NvcnQoCiAvKj09PT09PT09PT09Ki8KIAl0cnhfdCoJCQl0cngsCS8qITwgaW46
IHRyYW5zYWN0aW9uICovCi0JY29uc3Qgcm93X21lcmdlX2R1cF90KglkdXAsCS8qITwgaW46IGlu
ZGV4IGJlaW5nIGNyZWF0ZWQgKi8KKwljb25zdCByb3dfbWVyZ2VfZHVwX3QqCWR1cCwJLyohPCBp
bjogZGVzY3JpcHRvciBvZgorCQkJCQlpbmRleCBiZWluZyBjcmVhdGVkICovCiAJbWVyZ2VfZmls
ZV90KgkJZmlsZSwJLyohPCBpbi9vdXQ6IGZpbGUgY29udGFpbmluZwogCQkJCQlpbmRleCBlbnRy
aWVzICovCiAJcm93X21lcmdlX2Jsb2NrX3QqCWJsb2NrLAkvKiE8IGluL291dDogMyBidWZmZXJz
ICovCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==