From: marko.makela
Date: May 2 2012 1:10pm
Subject: bzr push into mysql-trunk branch (marko.makela:3763 to 3764)
List-Archive: http://lists.mysql.com/commits/143707
Message-Id: <201205021310.q42DAvS5001045@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM3NjQgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0wMgogICAgICBOb24tZnVuY3Rpb25hbCBjaGFu
Z2VzLgogICAgICAKICAgICAgZGljdF9tZW1fdGFibGVfY3JlYXRlKCk6IFJlbW92ZSBib2d1cyBj
b21tZW50IGFib3V0IGNsdXN0ZXJlZCB0YWJsZXMsCiAgICAgIHdoaWNoIHdlcmUgbmV2ZXIgaW1w
bGVtZW50ZWQgaW4gSW5ub0RCLgogICAgICAKICAgICAgY3JlYXRlX3RhYmxlX2RlZigpOiBSZW1v
dmUgdW5uZWNlc3NhcnkgdHlwZSBjYXN0cy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9kaWN0L2RpY3QwbWVtLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9o
YV9pbm5vZGIuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwbWVtLmgKIDM3
NjMgUm9oaXQgS2FsaGFucwkyMDEyLTA1LTAyIFttZXJnZV0KICAgICAgV0wjNTU5NzogVXNpbmcg
YmF0Y2ggb3BlcmF0aW9ucyB3aGVuIHRoZXJlIGlzIG5vIGluZGV4IGluIFJCUgogICAgICAKICAg
ICAgQ09OVEVYVAogICAgICAtLS0tLS0tCiAgICAgIAogICAgICBXaXRoIFJCUiwgaWYgYSB0YWJs
ZSBoYXMgbm8gaW5kZXhlcywgdGhlIHNsYXZlIGRvZXMgYSBmdWxsIHRhYmxlIHNjYW4gZm9yIGVh
Y2gKICAgICAgcm93IGNoYW5nZWQgKGkuZS4gdXBkYXRlZCBvciBkZWxldGVkKS4gVGhpcyBjYW4g
YmUgZXh0cmVtZWx5IHRpbWUgY29uc3VtaW5nCiAgICAgIHdoZW4gdGhlcmUgaXMgYSBoaWdoIG51
bWJlciBvZiByb3dzIHRvIGJlIHVwZGF0ZWQuCiAgICAgIAogICAgICBTT0xVVElPTgogICAgICAt
LS0tLS0tLS0KICAgICAgCiAgICAgIFdoZW4gdGhlcmUgaXMgYSB0YWJsZSB3aXRob3V0IGEgUEsg
b3IgYW4gSU5ERVgsIGNyZWF0ZSBhIHRlbXBvcmFyeSBpbi1tZW1vcnkKICAgICAgaW5kZXggKGUu
Zy4gaW4tbWVtb3J5IGhhc2ggdGFibGUpIGFuZCBzdG9yZSB0aGUgcm93cyB0byBiZSB1cGRhdGUg
aW4gaXQuIFRoZW4gZm9yCiAgICAgIGVhY2ggcm93IGluIHRoZSB0YWJsZSwgY2hlY2sgaWYgdGhl
IHJvdyBleGlzdHMgaW4gdGhlIGhhc2ggdGFibGUuIElmIHRoZXJlIGlzIGEKICAgICAgbWF0Y2gs
IGRvIHRoZSBvcGVyYXRpb24sIGkuZS4gdXBkYXRlIG9yIGRlbGV0ZS4KCiAgICByZW1vdmVkOgog
ICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC9yL3JwbF9yb3dfZmluZF9yb3dfZGVidWcucmVzdWx0
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3QvcnBsX3Jvd19maW5kX3Jvd19kZWJ1Zy50ZXN0
CiAgICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9leHRyYS9ycGxfdGVzdHMvcnBsX3Jvd19pZGVt
cG90ZW5jeS50ZXN0CiAgICAgIG15c3FsLXRlc3QvaW5jbHVkZS9ycGxfaGFzaF9zY2FuX2Fzc2Vy
dGlvbi5pbmMKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfcm93X2hhc2hfc2Nhbi5y
ZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfcm93X2hhc2hfc2Nhbl9zYW5p
dHkucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3QvcnBsX3Jvd19oYXNoX3NjYW4u
dGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC90L3JwbF9yb3dfaGFzaF9zY2FuX3Nhbml0
eS50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvci9zbGF2ZV9yb3dzX3NlYXJj
aF9hbGdvcml0aG1zX2Jhc2ljLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJz
L3Qvc2xhdmVfcm93c19zZWFyY2hfYWxnb3JpdGhtc19iYXNpYy50ZXN0CiAgICBtb2RpZmllZDoK
ICAgICAgbXlzcWwtdGVzdC9jb2xsZWN0aW9ucy9kZWZhdWx0LmRhaWx5CiAgICAgIG15c3FsLXRl
c3QvZXh0cmEvcnBsX3Rlc3RzL3JwbF9yZWNvcmRfY29tcGFyZS50ZXN0CiAgICAgIG15c3FsLXRl
c3Qvci9teXNxbGQtLWhlbHAtbm90d2luLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvbXlzcWxk
LS1oZWxwLXdpbi5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvci9ycGxfYnVnMjYz
OTUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX3BhcmFsbGVsX3N0YXJ0
X3N0b3AucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX3JlbGF5cm90YXRl
LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3JwbC9yL3JwbF9yb3dfaWRlbXBvdGVuY3ku
cmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX3Jvd19yZWNfY29tcF9pbm5v
ZGIucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX3Jvd19yZWNfY29tcF9t
eWlzYW0ucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3QvcnBsX2J1ZzI2Mzk1LnRl
c3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvdC9ycGxfcGFyYWxsZWxfc3RhcnRfc3RvcC50
ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3QvcnBsX3JlbGF5cm90YXRlLnRlc3QKICAg
ICAgbXlzcWwtdGVzdC9zdWl0ZS9ycGwvdC9ycGxfcm93X2lkZW1wb3RlbmN5LnRlc3QKICAgICAg
c3FsL2hhbmRsZXIuaAogICAgICBzcWwvbG9nX2V2ZW50LmNjCiAgICAgIHNxbC9sb2dfZXZlbnQu
aAogICAgICBzcWwvbXlzcWxkLmNjCiAgICAgIHNxbC9teXNxbGQuaAogICAgICBzcWwvcnBsX3V0
aWxpdHkuY2MKICAgICAgc3FsL3JwbF91dGlsaXR5LmgKICAgICAgc3FsL3NxbF9jbGFzcy5oCiAg
ICAgIHNxbC9zeXNfdmFycy5jYwogICAgICBzdG9yYWdlL2JsYWNraG9sZS9oYV9ibGFja2hvbGUu
aAo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwbWVtLmNjJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBtZW0uY2MJcmV2aWQ6cm9oaXQua2FsaGFu
c0BvcmFjbGUuY29tLTIwMTIwNTAyMTIwNDQyLXBlb2g4YmVsb3k3ejNmczgKKysrIGIvc3RvcmFn
ZS9pbm5vYmFzZS9kaWN0L2RpY3QwbWVtLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTIwNTAyMTMwOTU4LTM0YzZtYWp4OXY0aWMydzIKQEAgLTYxLDkgKzYxLDcgQEAgZGljdF9t
ZW1fdGFibGVfY3JlYXRlKAogLyo9PT09PT09PT09PT09PT09PT0qLwogCWNvbnN0IGNoYXIqCW5h
bWUsCS8qITwgaW46IHRhYmxlIG5hbWUgKi8KIAl1bGludAkJc3BhY2UsCS8qITwgaW46IHNwYWNl
IHdoZXJlIHRoZSBjbHVzdGVyZWQgaW5kZXggb2YKLQkJCQl0aGUgdGFibGUgaXMgcGxhY2VkOyB0
aGlzIHBhcmFtZXRlciBpcwotCQkJCWlnbm9yZWQgaWYgdGhlIHRhYmxlIGlzIG1hZGUgYSBtZW1i
ZXIgb2YKLQkJCQlhIGNsdXN0ZXIgKi8KKwkJCQl0aGUgdGFibGUgaXMgcGxhY2VkICovCiAJdWxp
bnQJCW5fY29scywJLyohPCBpbjogbnVtYmVyIG9mIGNvbHVtbnMgKi8KIAl1bGludAkJZmxhZ3Ms
CS8qITwgaW46IHRhYmxlIGZsYWdzICovCiAJdWxpbnQJCWZsYWdzMikJLyohPCBpbjogdGFibGUg
ZmxhZ3MyICovCkBAIC0xMTcsOCArMTE1LDYgQEAgZGljdF9tZW1fdGFibGVfY3JlYXRlKAogCQl0
YWJsZS0+ZnRzID0gZnRzX2NyZWF0ZSh0YWJsZSk7CiAJCXRhYmxlLT5mdHMtPmNhY2hlID0gZnRz
X2NhY2hlX2NyZWF0ZSh0YWJsZSk7CiAJCWZ0c19vcHRpbWl6ZV9hZGRfdGFibGUodGFibGUpOwot
CX0gZWxzZSB7Ci0JCXRhYmxlLT5mdHMgPSBOVUxMOwogCX0KICNlbmRpZiAvKiAhVU5JVl9IT1RC
QUNLVVAgKi8KIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9o
YV9pbm5vZGIuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuY2MJ
cmV2aWQ6cm9oaXQua2FsaGFuc0BvcmFjbGUuY29tLTIwMTIwNTAyMTIwNDQyLXBlb2g4YmVsb3k3
ejNmczgKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUwMjEzMDk1OC0zNGM2bWFqeDl2NGljMncyCkBA
IC04MTc3LDcgKzgxNzcsNyBAQCBjcmVhdGVfdGFibGVfZGVmKAogCQkJCSJjb2x1bW4gdHlwZSBh
bmQgdHJ5IHRvIHJlLWNyZWF0ZSAiCiAJCQkJInRoZSB0YWJsZSB3aXRoIGFuIGFwcHJvcHJpYXRl
ICIKIAkJCQkiY29sdW1uIHR5cGUuIiwKLQkJCQl0YWJsZS0+bmFtZSwgKGNoYXIqKSBmaWVsZC0+
ZmllbGRfbmFtZSk7CisJCQkJdGFibGUtPm5hbWUsIGZpZWxkLT5maWVsZF9uYW1lKTsKIAkJCWdv
dG8gZXJyX2NvbDsKIAkJfQogCkBAIC04MjQxLDcgKzgyNDEsNyBAQCBlcnJfY29sOgogCQl9CiAK
IAkJZGljdF9tZW1fdGFibGVfYWRkX2NvbCh0YWJsZSwgaGVhcCwKLQkJCShjaGFyKikgZmllbGQt
PmZpZWxkX25hbWUsCisJCQlmaWVsZC0+ZmllbGRfbmFtZSwKIAkJCWNvbF90eXBlLAogCQkJZHR5
cGVfZm9ybV9wcnR5cGUoCiAJCQkJKHVsaW50KSBmaWVsZC0+dHlwZSgpCgo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwbWVtLmgnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9kaWN0MG1lbS5oCXJldmlkOnJvaGl0LmthbGhhbnNAb3JhY2xlLmNv
bS0yMDEyMDUwMjEyMDQ0Mi1wZW9oOGJlbG95N3ozZnM4CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9kaWN0MG1lbS5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTAy
MTMwOTU4LTM0YzZtYWp4OXY0aWMydzIKQEAgLTIyNiw5ICsyMjYsNyBAQCBkaWN0X21lbV90YWJs
ZV9jcmVhdGUoCiAvKj09PT09PT09PT09PT09PT09PSovCiAJY29uc3QgY2hhcioJbmFtZSwJCS8q
ITwgaW46IHRhYmxlIG5hbWUgKi8KIAl1bGludAkJc3BhY2UsCQkvKiE8IGluOiBzcGFjZSB3aGVy
ZSB0aGUgY2x1c3RlcmVkIGluZGV4Ci0JCQkJCW9mIHRoZSB0YWJsZSBpcyBwbGFjZWQ7IHRoaXMg
cGFyYW1ldGVyCi0JCQkJCWlzIGlnbm9yZWQgaWYgdGhlIHRhYmxlIGlzIG1hZGUKLQkJCQkJYSBt
ZW1iZXIgb2YgYSBjbHVzdGVyICovCisJCQkJCW9mIHRoZSB0YWJsZSBpcyBwbGFjZWQgKi8KIAl1
bGludAkJbl9jb2xzLAkJLyohPCBpbjogbnVtYmVyIG9mIGNvbHVtbnMgKi8KIAl1bGludAkJZmxh
Z3MsCQkvKiE8IGluOiB0YWJsZSBmbGFncyAqLwogCXVsaW50CQlmbGFnczIpOwkvKiE8IGluOiB0
YWJsZSBmbGFnczIgKi8KCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWls
cyku