From: marko.makela
Date: February 1 2012 9:00pm
Subject: bzr push into mysql-trunk branch (marko.makela:3818 to 3819)
List-Archive: http://lists.mysql.com/commits/142704
Message-Id: <201202012100.q11L0M7I011745@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4MTkgTWFya28gTcOka2Vsw6QJMjAxMi0wMi0wMQogICAgICBGaXggdHdvIGNvbXBpbGVyIHdh
cm5pbmdzIG9uIFdpbmRvd3MuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
aWJ1Zi9pYnVmMGlidWYuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQog
MzgxOCBPbGUgSm9obiBBc2tlCTIwMTItMDItMDEKICAgICAgRml4IGZvciBidWcjMTM1Mjg4MjYg
IFRFU1RfSUZfQ0hFQVBFUl9PUkRFUklORygpOiBDQUxDVUxBVEVTIElOQ09SUkVDVCAnU0VMRUNU
X0xJTUlUCiAgICAgIAogICAgICBBbiBpbmNvcnJlY3QgJ2FkanVzdGVkIHNlbGVjdF9saW1pdCcg
d2FzIHJldHVybmVkIGZyb20gdGVzdF9pZl9jaGVhcGVyX29yZGVyaW5nKCkKICAgICAgaWYgbm8g
ZXhjcGxpY2l0IGxpbWl0LWNsYXVzZSB3YXMgc3BlY2lmaWVkIGluIHRoZSBxdWVyeS4KICAgICAg
CiAgICAgIFRoaXMgZml4IGRldGVjdCB3aGVuIGEgbGltaXQtY2xhdXNlIHdhcyBub3Qgc3BlY2lm
aWVkLCBhbmQgcmV0dXJucyB0aGUKICAgICAgZnVsbCAndGFibGVfcmVjb3Jkcycgd2hlbiBubyBs
aW1pdC1jbGF1c2Ugd2FzIHVzZWQuCiAgICAgIAogICAgICBGdXJ0aGVybW9yZSwgdGhpcyBmaXgg
Y2F1c2VkIHRoZSB0ZXN0Y2FzZSBmb3IgYnVnICMxMjgzODQyMCAKICAgICAgdG8gY2hhbmdlIGJl
eW9uZCB3aGF0IHdhcyByZXF1aXJlZCBhcyBhIHRlc3RjYXNlIGZvciB0aGF0IGJ1Zy4KICAgICAg
ICAgICAgCiAgICAgIEZpeGVkIHRoYXQgYnkgZm9yY2luZyBjb3JyZWN0IHF1ZXJ5IHBsYW4gZm9y
IHRlc3RjYXNlIGJ5CiAgICAgIGludHJvZHVjaW5nICdVU0UgSU5ERVgnIGFuZCAnU1RSQUlHSFRf
Sk9JTicuCiAgICAgQCBteXNxbC10ZXN0L2luY2x1ZGUvaWNwX3Rlc3RzLmluYwogICAgICAgIFNs
aWdodGx5IGNoYW5nZWQgc3ludGF4IG9mIHRlc3RjYXNlIGluIG9yZGVyIHRvIGZvcmNlIHJlcXVp
cmVkIHF1ZXJ5IHBsYW4KICAgICAgICBmb3IgdGhpcyB0ZXN0Y2FzZS4KICAgICBAIG15c3FsLXRl
c3QvaW5jbHVkZS9vcmRlcl9ieS5pbmMKICAgICAgICBOZXcgdGVzdGNhc2UgZm9yIHRoaXMgYnVn
CiAgICAgQCBteXNxbC10ZXN0L3IvaW5ub2RiX2ljcC5yZXN1bHQKICAgICAgICBSZXN1bHQgc2hv
dWxkIHJlcG9ydCB0aGUgZnVsbCBudW1iZXIgb2YgcmVjb3JkcyBpbiB0YWJsZSB3by8gYW55IGxp
bWl0IGNsYXVzZS4KICAgICAgICBBbHNvIHNsaWdodGx5IGNoYW5nZWQgc3ludGF4IG9mIHRlc3Rj
YXNlIGluIG9yZGVyIHRvIGZvcmNlIHJlcXVpcmVkIHF1ZXJ5IHBsYW4KICAgICAgICBmb3IgdGhp
cyB0ZXN0Y2FzZS4KICAgICBAIG15c3FsLXRlc3Qvci9pbm5vZGJfaWNwX2FsbC5yZXN1bHQKICAg
ICAgICBSZXN1bHQgc2hvdWxkIHJlcG9ydCB0aGUgZnVsbCBudW1iZXIgb2YgcmVjb3JkcyBpbiB0
YWJsZSB3by8gYW55IGxpbWl0IGNsYXVzZS4KICAgICAgICBBbHNvIHNsaWdodGx5IGNoYW5nZWQg
c3ludGF4IG9mIHRlc3RjYXNlIGluIG9yZGVyIHRvIGZvcmNlIHJlcXVpcmVkIHF1ZXJ5IHBsYW4K
ICAgICAgICBmb3IgdGhpcyB0ZXN0Y2FzZS4KICAgICBAIG15c3FsLXRlc3Qvci9pbm5vZGJfaWNw
X25vbmUucmVzdWx0CiAgICAgICAgUmVzdWx0IHNob3VsZCByZXBvcnQgdGhlIGZ1bGwgbnVtYmVy
IG9mIHJlY29yZHMgaW4gdGFibGUgd28vIGFueSBsaW1pdCBjbGF1c2UuCiAgICAgICAgQWxzbyBz
bGlnaHRseSBjaGFuZ2VkIHN5bnRheCBvZiB0ZXN0Y2FzZSBpbiBvcmRlciB0byBmb3JjZSByZXF1
aXJlZCBxdWVyeSBwbGFuCiAgICAgICAgZm9yIHRoaXMgdGVzdGNhc2UuCiAgICAgQCBteXNxbC10
ZXN0L3Ivam9pbl9jYWNoZV9ub2piLnJlc3VsdAogICAgICAgIFJlc3VsdCBzaG91bGQgcmVwb3J0
IHRoZSBmdWxsIG51bWJlciBvZiByZWNvcmRzIGluIHRhYmxlIHdvLyBhbnkgbGltaXQgY2xhdXNl
LgogICAgIEAgbXlzcWwtdGVzdC9yL215aXNhbV9pY3AucmVzdWx0CiAgICAgICAgU2xpZ2h0bHkg
Y2hhbmdlZCBzeW50YXggb2YgdGVzdGNhc2UgaW4gb3JkZXIgdG8gZm9yY2UgcmVxdWlyZWQgcXVl
cnkgcGxhbgogICAgICAgIGZvciB0aGlzIHRlc3RjYXNlLgogICAgIEAgbXlzcWwtdGVzdC9yL215
aXNhbV9pY3BfYWxsLnJlc3VsdAogICAgICAgIFNsaWdodGx5IGNoYW5nZWQgc3ludGF4IG9mIHRl
c3RjYXNlIGluIG9yZGVyIHRvIGZvcmNlIHJlcXVpcmVkIHF1ZXJ5IHBsYW4KICAgICAgICBmb3Ig
dGhpcyB0ZXN0Y2FzZS4KICAgICBAIG15c3FsLXRlc3Qvci9teWlzYW1faWNwX25vbmUucmVzdWx0
CiAgICAgICAgU2xpZ2h0bHkgY2hhbmdlZCBzeW50YXggb2YgdGVzdGNhc2UgaW4gb3JkZXIgdG8g
Zm9yY2UgcmVxdWlyZWQgcXVlcnkgcGxhbgogICAgICAgIGZvciB0aGlzIHRlc3RjYXNlLgogICAg
IEAgbXlzcWwtdGVzdC9yL29yZGVyX2J5X2FsbC5yZXN1bHQKICAgICAgICBBY2NlcHQgcmVzdWx0
IGZvciBuZXcgdGVzdGNhc2UKICAgICBAIG15c3FsLXRlc3Qvci9vcmRlcl9ieV9pY3BfbXJyLnJl
c3VsdAogICAgICAgIEFjY2VwdCByZXN1bHQgZm9yIG5ldyB0ZXN0Y2FzZQogICAgIEAgbXlzcWwt
dGVzdC9yL29yZGVyX2J5X25vbmUucmVzdWx0CiAgICAgICAgQWNjZXB0IHJlc3VsdCBmb3IgbmV3
IHRlc3RjYXNlCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3QvaW5jbHVkZS9pY3BfdGVz
dHMuaW5jCiAgICAgIG15c3FsLXRlc3QvaW5jbHVkZS9vcmRlcl9ieS5pbmMKICAgICAgbXlzcWwt
dGVzdC9yL2lubm9kYl9pY3AucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9pbm5vZGJfaWNwX2Fs
bC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2lubm9kYl9pY3Bfbm9uZS5yZXN1bHQKICAgICAg
bXlzcWwtdGVzdC9yL2pvaW5fY2FjaGVfbm9qYi5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL215
aXNhbV9pY3AucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9teWlzYW1faWNwX2FsbC5yZXN1bHQK
ICAgICAgbXlzcWwtdGVzdC9yL215aXNhbV9pY3Bfbm9uZS5yZXN1bHQKICAgICAgbXlzcWwtdGVz
dC9yL29yZGVyX2J5X2FsbC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL29yZGVyX2J5X2ljcF9t
cnIucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9vcmRlcl9ieV9ub25lLnJlc3VsdAogICAgICBz
cWwvc3FsX3NlbGVjdC5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pYnVm
L2lidWYwaWJ1Zi5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jYwly
ZXZpZDpvbGUuam9obi5hc2tlQG9yYWNsZS5jb20tMjAxMjAyMDEwOTU5MTMtamN1NHllYzN0bzRo
dXVmNQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmNjCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwMjAxMjA1OTE1LTJ1M3U4YmpyNzJtanl0NG8KQEAgLTI0
MjMsNyArMjQyMyw4IEBAIGlidWZfZ2V0X21lcmdlX3BhZ2Vfbm9zX2Z1bmMoCiAJCQlzbWFsbGVz
dCBwb3NzaWJsZSBzZWNvbmRhcnkgaW5kZXggbGVhZiBwYWdlCiAJCQkoYW5kIHRoYXQgb25seSBh
ZnRlciBEUk9QIElOREVYKS4gKi8KIAkJCXV0X2FkKHJlY19wYWdlX25vCi0JCQkgICAgICA+IElC
VUZfVFJFRV9ST09UX1BBR0VfTk8gLSAocmVjX3NwYWNlX2lkICE9IDApKTsKKwkJCSAgICAgID4g
KHVsaW50KSBJQlVGX1RSRUVfUk9PVF9QQUdFX05PCisJCQkgICAgICAtIChyZWNfc3BhY2VfaWQg
IT0gMCkpOwogCQl9CiAKICNpZmRlZiBVTklWX0lCVUZfREVCVUcKCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvdW5pdi5pCXJldmlkOm9sZS5qb2huLmFza2VAb3JhY2xlLmNvbS0yMDEyMDIwMTA5
NTkxMy1qY3U0eWVjM3RvNGh1dWY1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2
LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjAyMDEyMDU5MTUtMnUzdThianI3
Mm1qeXQ0bwpAQCAtMSw2ICsxLDYgQEAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgogCi1Db3B5cmln
aHQgKGMpIDE5OTQsIDIwMTEsIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdo
dHMgUmVzZXJ2ZWQuCitDb3B5cmlnaHQgKGMpIDE5OTQsIDIwMTIsIE9yYWNsZSBhbmQvb3IgaXRz
IGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiBDb3B5cmlnaHQgKGMpIDIwMDgsIEdv
b2dsZSBJbmMuCiAKIFBvcnRpb25zIG9mIHRoaXMgZmlsZSBjb250YWluIG1vZGlmaWNhdGlvbnMg
Y29udHJpYnV0ZWQgYW5kIGNvcHlyaWdodGVkIGJ5CkBAIC0xNTUsNyArMTU1LDcgQEAgYmUgZXhj
bHVkZWQgZnJvbSBpbnN0cnVtZW50YXRpb24uICovCiAjZW5kaWYgLyogSEFWRV9QU0lfSU5URVJG
QUNFICovCiAKICNpZmRlZiBfX1dJTl9fCi0jIGRlZmluZSBZWV9OT19VTklTVERfSAorIyBkZWZp
bmUgWVlfTk9fVU5JU1REX0ggMQogI2VuZGlmIC8qIF9fV0lOX18gKi8KIAogLyoJCQlERUJVRyBW
RVJTSU9OIENPTlRST0wKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWls
cyku