From: Tor Didriksen
Date: May 27 2011 9:17am
Subject: bzr push into mysql-trunk branch (tor.didriksen:3315 to 3316)
List-Archive: http://lists.mysql.com/commits/138295
Message-Id: <20110527091704.D42E724C@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDMzMTYgVG9yIERpZHJpa3NlbgkyMDExLTA1LTI3CiAgICAgIHMvQVNTRVJUX0VRKGZhbHNlLCAv
QVNTRVJUX0ZBTFNFKC9nCiAgICAgIAogICAgICBiZWNhdXNlIGl0IGlzICJ0aGUgcmlnaHQgdGhp
bmciCiAgICAgIGFuZCBiZWNhdXNlIGl0IGRvZXMgbm90IGNvbXBpbGUgd2l0aCBnY2MgNC41LjEK
ICAgICAgCiAgICAgIHVuaXR0ZXN0L2d1bml0L29wdF90cmFjZS10LmNjOjMzODoxNTY6IAogICAg
ICBlcnJvcjogY29udmVydGluZyBmYWxzZSB0byBwb2ludGVyIHR5cGUgZm9yIGFyZ3VtZW50IDEg
b2YgCiAgICAgIGNoYXIgdGVzdGluZzo6aW50ZXJuYWw6OklzTnVsbExpdGVyYWxIZWxwZXIodGVz
dGluZzo6aW50ZXJuYWw6OlNlY3JldCopCgogICAgbW9kaWZpZWQ6CiAgICAgIHVuaXR0ZXN0L2d1
bml0L29wdF90cmFjZS10LmNjCiAzMzE1IEd1aWxoZW0gQmljaG90CTIwMTEtMDUtMjYKICAgICAg
Zml4IGZvciBCVUcjMTI1OTUyMTAgLSBKU09OIFNZTlRBWCBFUlJPUiBBU1NFUlQgT04gV0hFUkUg
RklFTEQgTk9UIElOIFNVQlFVRVJZCiAgICAgQCBteXNxbC10ZXN0L3N1aXRlL29wdGltaXplcl90
cmFjZS90L29wdGltaXplcl90cmFjZV9idWdzLnRlc3QKICAgICAgICB0ZXN0IGZvciBidWc7IHVz
ZWQgdG8gY3Jhc2guIEJVRyAxMjU5NTY4OCB3YXMgZmlsZWQgYWxvbmcgdGhlIHdheS4KICAgICBA
IHNxbC9pdGVtX3N1YnNlbGVjdC5jYwogICAgICAgIHdoZW4gZG9pbmcgSU4tPkVYSVNUUyB0cmFu
c2Zvcm1hdGlvbiBvZiBJTihzZWxlY3QpLAogICAgICAgIGlmICJzZWxlY3QiIGNvbnRhaW5zIHNv
bWUgY29uc3RhbnQgV0hFUkUvSEFWSU5HIGNsYXVzZSB3ZSBtYXkgZXZhbHVhdGUgaXQ7CiAgICAg
ICAgdGhpcyBtYXkgZXZhbHVhdGUgYSBzdWJxdWVyeSAoaWYgdGhlIFdIRVJFL0hBVklORyBoYXMg
YSBzdWJxdWVyeSkuIFRoaXMgY2F1c2VkCiAgICAgICAgYSBzeW50YXggZXJyb3IgbGlrZSB0aGlz
OgogICAgICAgICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgInRy
YW5zZm9ybWF0aW9uIjogewogICAgICAgICAgICAgICAgICAgICAgICAgICAgInNlbGVjdCMiOiAy
LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgImZyb20iOiAiSU4gKFNFTEVDVCkiLAogICAg
ICAgICAgICAgICAgICAgICAgICAgICAgInRvIjogIkVYSVNUUyAoQ09SUkVMQVRFRCBTRUxFQ1Qp
IiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICJjaG9zZW4iOiB0cnVlKiogaW52YWxpZCBK
U09OIChtaXNzaW5nIGtleSkgKiogLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIj8iOiB7
CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzdWJzZWxlY3RfZXhlY3V0aW9uIjogewog
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzZWxlY3QjIjogMywKICAgICAgICBXaGVy
ZToKICAgICAgICAic3Vic2VsZWN0X2V4ZWN1dGlvbiIgYW5kIGl0cyBvdXRlciB1bm5hbWVkIG9i
amVjdCBjb21lIGZyb20gam9pbi0+Y29uZHMtPmZpeF9maWVsZHMoKQogICAgICAgIGNhbGxlZCBp
biBJdGVtX2luX3N1YnNlbGVjdDo6cm93X3ZhbHVlX2luX3RvX2V4aXN0c190cmFuc2Zvcm1lcigp
CiAgICAgICAgKHRyYW5zZm9ybWluZyBzZWxlY3QjMiB3aXRoIElOLT5FWElTVFMsIGV2YWx1YXRp
bmcgaXRzIFdIRVJFIGNsYXVzZSBhbG9uZyB0aGUgd2F5LAogICAgICAgIHdoaWNoIG1lYW5zIGV2
YWx1YXRpbmcgdGhlIGNvbnN0YW50IHNlbGVjdCMzKS4KICAgICAgICBUaGUgZml4IGlzIHRvIG9w
ZW4gYSBuYW1lZCBvYmplY3Qgd2hlbiBhYm91dCB0byBldmFsdWF0ZSB0aGUgY29uc3RhbnQgV0hF
UkUsCiAgICAgICAgc28gdGhhdCBzdWJxdWVyeSBleGVjdXRpb24gZml0cyBpbnRvIGl0LgogICAg
ICAgIFNhbWUgZm9yIEhBVklORy4KICAgICAgICBTYW1lIGZvciB0cmFuc2Zvcm1hdGlvbnMgb2Yg
cmV0dXJuaW5nLXNpbmdsZS1jb2x1bW4gc3VicXVlcmllcy4KCiAgICBtb2RpZmllZDoKICAgICAg
bXlzcWwtdGVzdC9zdWl0ZS9vcHRpbWl6ZXJfdHJhY2Uvci9vcHRpbWl6ZXJfdHJhY2UyX25vX3By
b3QucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvb3B0aW1pemVyX3RyYWNlL3Ivb3B0aW1p
emVyX3RyYWNlX2J1Z3MucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvb3B0aW1pemVyX3Ry
YWNlL3Ivb3B0aW1pemVyX3RyYWNlX25vX3Byb3QucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3Vp
dGUvb3B0aW1pemVyX3RyYWNlL3Ivb3B0aW1pemVyX3RyYWNlX3BzX3Byb3QucmVzdWx0CiAgICAg
IG15c3FsLXRlc3Qvc3VpdGUvb3B0aW1pemVyX3RyYWNlL3Ivb3B0aW1pemVyX3RyYWNlX3Jhbmdl
X25vX3Byb3QucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvb3B0aW1pemVyX3RyYWNlL3Qv
b3B0aW1pemVyX3RyYWNlX2J1Z3MudGVzdAogICAgICBzcWwvaXRlbV9zdWJzZWxlY3QuY2MKPT09
IG1vZGlmaWVkIGZpbGUgJ3VuaXR0ZXN0L2d1bml0L29wdF90cmFjZS10LmNjJwotLS0gYS91bml0
dGVzdC9ndW5pdC9vcHRfdHJhY2UtdC5jYwkyMDExLTA1LTA2IDEyOjAyOjE1ICswMDAwCisrKyBi
L3VuaXR0ZXN0L2d1bml0L29wdF90cmFjZS10LmNjCTIwMTEtMDUtMjcgMDk6MTY6NDMgKzAwMDAK
QEAgLTMzNSw4ICszMzUsOCBAQCBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgQnVnZ3lPYmplY3Qp
CiAvKiogVGVzdCByZWFjdGlvbiB0byBtYWxmb3JtZWQgSlNPTiAoYXJyYXkgd2l0aCB2YWx1ZSB3
aXRoIGtleSkgKi8KIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBCdWdneUFycmF5KQogewotICBB
U1NFUlRfRVEoZmFsc2UsIHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCB0cnVlLCBmYWxzZSwgLTEs
IDEsIFVMT05HX01BWCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbGxfZmVhdHVy
ZXMpKTsKKyAgQVNTRVJUX0ZBTFNFKHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCB0cnVlLCBmYWxz
ZSwgLTEsIDEsIFVMT05HX01BWCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGFsbF9mZWF0
dXJlcykpOwogICB7CiAgICAgT3B0X3RyYWNlX29iamVjdCBvdG8oJnRyYWNlKTsKICAgICB7CkBA
IC02MTEsOCArNjExLDggQEAgVEVTVF9GKFRyYWNlQ29udGVudFRlc3QsIE9mZnNldCkKIC8qKiBU
ZXN0IHRydW5jYXRpb24gYnkgbWF4X21lbV9zaXplICovCiBURVNUX0YoVHJhY2VDb250ZW50VGVz
dCwgTWF4TWVtU2l6ZSkKIHsKLSAgQVNTRVJUX0VRKGZhbHNlLCB0cmFjZS5zdGFydCh0cnVlLCBm
YWxzZSwgZmFsc2UsIGZhbHNlLCAtMSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAx
LCAxMDAwIC8qIG1heF9tZW1fc2l6ZSAqLywgYWxsX2ZlYXR1cmVzKSk7CisgIEFTU0VSVF9GQUxT
RSh0cmFjZS5zdGFydCh0cnVlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCAtMSwKKyAgICAgICAgICAg
ICAgICAgICAgICAgICAgIDEsIDEwMDAgLyogbWF4X21lbV9zaXplICovLCBhbGxfZmVhdHVyZXMp
KTsKICAgLyogbWFrZSBhICJsb25nIiB0cmFjZSAqLwogICB7CiAgICAgT3B0X3RyYWNlX29iamVj
dCBvdG8oJnRyYWNlKTsKQEAgLTY1MSw4ICs2NTEsOCBAQCBURVNUX0YoVHJhY2VDb250ZW50VGVz
dCwgTWF4TWVtU2l6ZSkKIC8qKiBUZXN0IGhvdyB0cnVuY2F0aW9uIGJ5IG1heF9tZW1fc2l6ZSBh
ZmZlY3RzIG5leHQgdHJhY2VzICovCiBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgTWF4TWVtU2l6
ZTIpCiB7Ci0gIEFTU0VSVF9FUShmYWxzZSwgdHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIGZhbHNl
LCBmYWxzZSwgLTIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMiwgMjEgLyogbWF4
X21lbV9zaXplICovLCBhbGxfZmVhdHVyZXMpKTsKKyAgQVNTRVJUX0ZBTFNFKHRyYWNlLnN0YXJ0
KHRydWUsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIC0yLAorICAgICAgICAgICAgICAgICAgICAgICAg
ICAgMiwgMjEgLyogbWF4X21lbV9zaXplICovLCBhbGxfZmVhdHVyZXMpKTsKICAgLyogbWFrZSBh
ICJsb25nIiB0cmFjZSAqLwogICB7CiAgICAgT3B0X3RyYWNlX29iamVjdCBvdG8oJnRyYWNlKTsK
QEAgLTY2MCw4ICs2NjAsOCBAQCBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgTWF4TWVtU2l6ZTIp
CiAgIH0KICAgdHJhY2UuZW5kKCk7CiAgIC8qIEEgc2Vjb25kIHNpbWlsYXIgdHJhY2UgKi8KLSAg
QVNTRVJUX0VRKGZhbHNlLCB0cmFjZS5zdGFydCh0cnVlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCAt
MiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAyLCAyMSwgYWxsX2ZlYXR1cmVzKSk7
CisgIEFTU0VSVF9GQUxTRSh0cmFjZS5zdGFydCh0cnVlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCAt
MiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIDIsIDIxLCBhbGxfZmVhdHVyZXMpKTsKICAg
ewogICAgIE9wdF90cmFjZV9vYmplY3Qgb3RvKCZ0cmFjZSk7CiAgICAgb3RvLmFkZF9hbG51bSgi
c29tZSBrZXkyIiwgIm1ha2UgaXQgbG9uZyIpOwpAQCAtNjg3LDggKzY4Nyw4IEBAIFRFU1RfRihU
cmFjZUNvbnRlbnRUZXN0LCBNYXhNZW1TaXplMikKICAgICAzcmQgdHJhY2U7IHRoZSBmaXJzdCBv
bmUgc2hvdWxkIGF1dG9tYXRpY2FsbHkgYmUgcHVyZ2VkLCB0aHVzIHRoZSAzcmQKICAgICBzaG91
bGQgaGF2ZSBhIGJpdCBvZiByb29tLgogICAqLwotICBBU1NFUlRfRVEoZmFsc2UsIHRyYWNlLnN0
YXJ0KHRydWUsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIC0yLAotICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgIDIsIDIxLCBhbGxfZmVhdHVyZXMpKTsKKyAgQVNTRVJUX0ZBTFNFKHRyYWNlLnN0
YXJ0KHRydWUsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIC0yLAorICAgICAgICAgICAgICAgICAgICAg
ICAgICAgMiwgMjEsIGFsbF9mZWF0dXJlcykpOwogICB7CiAgICAgT3B0X3RyYWNlX29iamVjdCBv
dG8oJnRyYWNlKTsKICAgICBvdG8uYWRkX2FsbnVtKCJzb21lIGtleTMiLCAibWFrZSBpdCBsb25n
Iik7CkBAIC03NDksOCArNzQ5LDggQEAgdm9pZCBvcGVuX29iamVjdCh1aW50IGNvdW50LCBPcHRf
dHJhY2VfYwogLy8vIFRlc3QgcmVhY3Rpb24gdG8gb3V0LW9mLW1lbW9yeSBjb25kaXRpb24gaW4g
dHJhY2UgYnVmZmVyCiBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgT09NaW5CdWZmZXIpCiB7Ci0g
IEFTU0VSVF9FUShmYWxzZSwgdHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwg
LTEsIDEsIFVMT05HX01BWCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbGxfZmVh
dHVyZXMpKTsKKyAgQVNTRVJUX0ZBTFNFKHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCBmYWxzZSwg
ZmFsc2UsIC0xLCAxLCBVTE9OR19NQVgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICBhbGxf
ZmVhdHVyZXMpKTsKICAgewogICAgIE9wdF90cmFjZV9vYmplY3Qgb3RvKCZ0cmFjZSk7CiAgICAg
ewpAQCAtNzc3LDggKzc3Nyw4IEBAIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBPT01pbkJ1ZmZl
cikKIC8vLyBUZXN0IHJlYWN0aW9uIHRvIG91dC1vZi1tZW1vcnkgY29uZGl0aW9uIGluIGJvb2st
a2VlcGluZyBkYXRhIHN0cnVjdHVyZXMKIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBPT01pbkJv
b2tLZWVwaW5nKQogewotICBBU1NFUlRfRVEoZmFsc2UsIHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNl
LCBmYWxzZSwgZmFsc2UsIC0xLCAxLCBVTE9OR19NQVgsCi0gICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgYWxsX2ZlYXR1cmVzKSk7CisgIEFTU0VSVF9GQUxTRSh0cmFjZS5zdGFydCh0cnVl
LCBmYWxzZSwgZmFsc2UsIGZhbHNlLCAtMSwgMSwgVUxPTkdfTUFYLAorICAgICAgICAgICAgICAg
ICAgICAgICAgICAgYWxsX2ZlYXR1cmVzKSk7CiAgIHsKICAgICBPcHRfdHJhY2Vfb2JqZWN0IG90
bygmdHJhY2UpOwogICAgIG9wZW5fb2JqZWN0KDEwMCwgJnRyYWNlLCB0cnVlKTsKQEAgLTg0MSw4
ICs4NDEsOCBAQCBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgT09NaW5QdXJnZSkKIC8qKiBUZXN0
IGZpbHRlcmluZyBieSBmZWF0dXJlICovCiBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgRmlsdGVy
aW5nQnlGZWF0dXJlKQogewotICBBU1NFUlRfRVEoZmFsc2UsIHRyYWNlLnN0YXJ0KHRydWUsIGZh
bHNlLCBmYWxzZSwgZmFsc2UsIC0xLCAxLCBVTE9OR19NQVgsCi0gICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgT3B0X3RyYWNlX2NvbnRleHQ6Ok1JU0MpKTsKKyAgQVNTRVJUX0ZBTFNFKHRy
YWNlLnN0YXJ0KHRydWUsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIC0xLCAxLCBVTE9OR19NQVgsCisg
ICAgICAgICAgICAgICAgICAgICAgICAgICBPcHRfdHJhY2VfY29udGV4dDo6TUlTQykpOwogICB7
CiAgICAgT3B0X3RyYWNlX29iamVjdCBvdG8oJnRyYWNlKTsKICAgICB7CkBAIC05MDQsOCArOTA0
LDggQEAgVEVTVF9GKFRyYWNlQ29udGVudFRlc3QsIEZpbHRlcmluZ0J5RmVhdAogLyoqIFRlc3Qg
ZXNjYXBpbmcgb2YgY2hhcmFjdGVycyAqLwogVEVTVF9GKFRyYWNlQ29udGVudFRlc3QsIEVzY2Fw
aW5nKQogewotICBBU1NFUlRfRVEoZmFsc2UsIHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCB0cnVl
LCBmYWxzZSwgLTEsIDEsIFVMT05HX01BWCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICBhbGxfZmVhdHVyZXMpKTsKKyAgQVNTRVJUX0ZBTFNFKHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNl
LCB0cnVlLCBmYWxzZSwgLTEsIDEsIFVMT05HX01BWCwKKyAgICAgICAgICAgICAgICAgICAgICAg
ICAgIGFsbF9mZWF0dXJlcykpOwogICAvLyBBbGwgQVNDSUkgMC0xMjcgY2hhcnMgYXJlIHZhbGlk
IFVURjggZW5jb2RpbmdzCiAgIGNoYXIgYWxsX2NoYXJzWzEzMF07CiAgIGZvciAodWludCBjPSAw
OyBjIDwgc2l6ZW9mKGFsbF9jaGFycykgLSAyIDsgYysrKQpAQCAtOTQ4LDggKzk0OCw4IEBAIFRF
U1RfRihUcmFjZUNvbnRlbnRUZXN0LCBFc2NhcGluZykKIC8qKiBUZXN0IGhvdyB0aGUgc3lzdGVt
IGhhbmRsZXMgbm9uLVVURjggY2hhcmFjdGVycywgYSB2aW9sYXRpb24gb2YgaXRzIEFQSSAqLwog
VEVTVF9GKFRyYWNlQ29udGVudFRlc3QsIE5vblV0ZjgpCiB7Ci0gIEFTU0VSVF9FUShmYWxzZSwg
dHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIHRydWUsIGZhbHNlLCAtMSwgMSwgVUxPTkdfTUFYLAot
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFsbF9mZWF0dXJlcykpOworICBBU1NFUlRf
RkFMU0UodHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIHRydWUsIGZhbHNlLCAtMSwgMSwgVUxPTkdf
TUFYLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgYWxsX2ZlYXR1cmVzKSk7CiAgIC8qCiAg
ICAgQSBzdHJpbmcgd2hpY2ggc3RhcnRzIHdpdGggaW52YWxpZCB1dGY4ICh0aGUgZm91ciBmaXJz
dCBieXRlcyBhcmUgw6nDqMOEw6AgaW4KICAgICBsYXRpbjEpLgpAQCAtMTAwMiw4ICsxMDAyLDgg
QEAgVEVTVF9GKFRyYWNlQ29udGVudFRlc3QsIE5vblV0ZjgpCiAqLwogVEVTVF9GKFRyYWNlQ29u
dGVudFRlc3QsIEluZGVudCkKIHsKLSAgQVNTRVJUX0VRKGZhbHNlLCB0cmFjZS5zdGFydCh0cnVl
LCBmYWxzZSwgZmFsc2UsIGZhbHNlLCAtMSwgMSwgVUxPTkdfTUFYLAotICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgIGFsbF9mZWF0dXJlcykpOworICBBU1NFUlRfRkFMU0UodHJhY2Uuc3Rh
cnQodHJ1ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgLTEsIDEsIFVMT05HX01BWCwKKyAgICAgICAg
ICAgICAgICAgICAgICAgICAgIGFsbF9mZWF0dXJlcykpOwogICB7CiAgICAgT3B0X3RyYWNlX29i
amVjdCBvdG8oJnRyYWNlKTsKICAgICBvcGVuX29iamVjdCgxMDAsICZ0cmFjZSwgZmFsc2UpOwoK
Tm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=