From: Tor Didriksen
Date: May 27 2011 9:16am
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3316)
List-Archive: http://lists.mysql.com/commits/138294
Message-Id: <20110527091653.B610524C@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0559435002498909475=="

--===============0559435002498909475==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

I0F0IGZpbGU6Ly8vZXhwb3J0L2hvbWUvZGlkcmlrL3JlcG8vbmV4dC1tci1vcHQtYmFja3BvcnRp
bmctd2w0ODAwLyBiYXNlZCBvbiByZXZpZDpndWlsaGVtLmJpY2hvdEBvcmFjbGUuY29tLTIwMTEw
NTI2MTYyNDA2LWhvamx2cXVia3Iwc285NmUKCiAzMzE2IFRvciBEaWRyaWtzZW4JMjAxMS0wNS0y
NwogICAgICBzL0FTU0VSVF9FUShmYWxzZSwgL0FTU0VSVF9GQUxTRSgvZwogICAgICAKICAgICAg
YmVjYXVzZSBpdCBpcyAidGhlIHJpZ2h0IHRoaW5nIgogICAgICBhbmQgYmVjYXVzZSBpdCBkb2Vz
IG5vdCBjb21waWxlIHdpdGggZ2NjIDQuNS4xCiAgICAgIAogICAgICB1bml0dGVzdC9ndW5pdC9v
cHRfdHJhY2UtdC5jYzozMzg6MTU2OiAKICAgICAgZXJyb3I6IGNvbnZlcnRpbmcgZmFsc2UgdG8g
cG9pbnRlciB0eXBlIGZvciBhcmd1bWVudCAxIG9mIAogICAgICBjaGFyIHRlc3Rpbmc6OmludGVy
bmFsOjpJc051bGxMaXRlcmFsSGVscGVyKHRlc3Rpbmc6OmludGVybmFsOjpTZWNyZXQqKQoKICAg
IG1vZGlmaWVkOgogICAgICB1bml0dGVzdC9ndW5pdC9vcHRfdHJhY2UtdC5jYwo9PT0gbW9kaWZp
ZWQgZmlsZSAndW5pdHRlc3QvZ3VuaXQvb3B0X3RyYWNlLXQuY2MnCi0tLSBhL3VuaXR0ZXN0L2d1
bml0L29wdF90cmFjZS10LmNjCTIwMTEtMDUtMDYgMTI6MDI6MTUgKzAwMDAKKysrIGIvdW5pdHRl
c3QvZ3VuaXQvb3B0X3RyYWNlLXQuY2MJMjAxMS0wNS0yNyAwOToxNjo0MyArMDAwMApAQCAtMzM1
LDggKzMzNSw4IEBAIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBCdWdneU9iamVjdCkKIC8qKiBU
ZXN0IHJlYWN0aW9uIHRvIG1hbGZvcm1lZCBKU09OIChhcnJheSB3aXRoIHZhbHVlIHdpdGgga2V5
KSAqLwogVEVTVF9GKFRyYWNlQ29udGVudFRlc3QsIEJ1Z2d5QXJyYXkpCiB7Ci0gIEFTU0VSVF9F
UShmYWxzZSwgdHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIHRydWUsIGZhbHNlLCAtMSwgMSwgVUxP
TkdfTUFYLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFsbF9mZWF0dXJlcykpOwor
ICBBU1NFUlRfRkFMU0UodHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIHRydWUsIGZhbHNlLCAtMSwg
MSwgVUxPTkdfTUFYLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgYWxsX2ZlYXR1cmVzKSk7
CiAgIHsKICAgICBPcHRfdHJhY2Vfb2JqZWN0IG90bygmdHJhY2UpOwogICAgIHsKQEAgLTYxMSw4
ICs2MTEsOCBAQCBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgT2Zmc2V0KQogLyoqIFRlc3QgdHJ1
bmNhdGlvbiBieSBtYXhfbWVtX3NpemUgKi8KIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBNYXhN
ZW1TaXplKQogewotICBBU1NFUlRfRVEoZmFsc2UsIHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCBm
YWxzZSwgZmFsc2UsIC0xLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsIDEwMDAg
LyogbWF4X21lbV9zaXplICovLCBhbGxfZmVhdHVyZXMpKTsKKyAgQVNTRVJUX0ZBTFNFKHRyYWNl
LnN0YXJ0KHRydWUsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIC0xLAorICAgICAgICAgICAgICAgICAg
ICAgICAgICAgMSwgMTAwMCAvKiBtYXhfbWVtX3NpemUgKi8sIGFsbF9mZWF0dXJlcykpOwogICAv
KiBtYWtlIGEgImxvbmciIHRyYWNlICovCiAgIHsKICAgICBPcHRfdHJhY2Vfb2JqZWN0IG90bygm
dHJhY2UpOwpAQCAtNjUxLDggKzY1MSw4IEBAIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBNYXhN
ZW1TaXplKQogLyoqIFRlc3QgaG93IHRydW5jYXRpb24gYnkgbWF4X21lbV9zaXplIGFmZmVjdHMg
bmV4dCB0cmFjZXMgKi8KIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBNYXhNZW1TaXplMikKIHsK
LSAgQVNTRVJUX0VRKGZhbHNlLCB0cmFjZS5zdGFydCh0cnVlLCBmYWxzZSwgZmFsc2UsIGZhbHNl
LCAtMiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAyLCAyMSAvKiBtYXhfbWVtX3Np
emUgKi8sIGFsbF9mZWF0dXJlcykpOworICBBU1NFUlRfRkFMU0UodHJhY2Uuc3RhcnQodHJ1ZSwg
ZmFsc2UsIGZhbHNlLCBmYWxzZSwgLTIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAyLCAy
MSAvKiBtYXhfbWVtX3NpemUgKi8sIGFsbF9mZWF0dXJlcykpOwogICAvKiBtYWtlIGEgImxvbmci
IHRyYWNlICovCiAgIHsKICAgICBPcHRfdHJhY2Vfb2JqZWN0IG90bygmdHJhY2UpOwpAQCAtNjYw
LDggKzY2MCw4IEBAIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBNYXhNZW1TaXplMikKICAgfQog
ICB0cmFjZS5lbmQoKTsKICAgLyogQSBzZWNvbmQgc2ltaWxhciB0cmFjZSAqLwotICBBU1NFUlRf
RVEoZmFsc2UsIHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIC0yLAotICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDIsIDIxLCBhbGxfZmVhdHVyZXMpKTsKKyAgQVNT
RVJUX0ZBTFNFKHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIC0yLAorICAg
ICAgICAgICAgICAgICAgICAgICAgICAgMiwgMjEsIGFsbF9mZWF0dXJlcykpOwogICB7CiAgICAg
T3B0X3RyYWNlX29iamVjdCBvdG8oJnRyYWNlKTsKICAgICBvdG8uYWRkX2FsbnVtKCJzb21lIGtl
eTIiLCAibWFrZSBpdCBsb25nIik7CkBAIC02ODcsOCArNjg3LDggQEAgVEVTVF9GKFRyYWNlQ29u
dGVudFRlc3QsIE1heE1lbVNpemUyKQogICAgIDNyZCB0cmFjZTsgdGhlIGZpcnN0IG9uZSBzaG91
bGQgYXV0b21hdGljYWxseSBiZSBwdXJnZWQsIHRodXMgdGhlIDNyZAogICAgIHNob3VsZCBoYXZl
IGEgYml0IG9mIHJvb20uCiAgICovCi0gIEFTU0VSVF9FUShmYWxzZSwgdHJhY2Uuc3RhcnQodHJ1
ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgLTIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgMiwgMjEsIGFsbF9mZWF0dXJlcykpOworICBBU1NFUlRfRkFMU0UodHJhY2Uuc3RhcnQodHJ1
ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgLTIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAy
LCAyMSwgYWxsX2ZlYXR1cmVzKSk7CiAgIHsKICAgICBPcHRfdHJhY2Vfb2JqZWN0IG90bygmdHJh
Y2UpOwogICAgIG90by5hZGRfYWxudW0oInNvbWUga2V5MyIsICJtYWtlIGl0IGxvbmciKTsKQEAg
LTc0OSw4ICs3NDksOCBAQCB2b2lkIG9wZW5fb2JqZWN0KHVpbnQgY291bnQsIE9wdF90cmFjZV9j
CiAvLy8gVGVzdCByZWFjdGlvbiB0byBvdXQtb2YtbWVtb3J5IGNvbmRpdGlvbiBpbiB0cmFjZSBi
dWZmZXIKIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBPT01pbkJ1ZmZlcikKIHsKLSAgQVNTRVJU
X0VRKGZhbHNlLCB0cmFjZS5zdGFydCh0cnVlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCAtMSwgMSwg
VUxPTkdfTUFYLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFsbF9mZWF0dXJlcykp
OworICBBU1NFUlRfRkFMU0UodHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwg
LTEsIDEsIFVMT05HX01BWCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGFsbF9mZWF0dXJl
cykpOwogICB7CiAgICAgT3B0X3RyYWNlX29iamVjdCBvdG8oJnRyYWNlKTsKICAgICB7CkBAIC03
NzcsOCArNzc3LDggQEAgVEVTVF9GKFRyYWNlQ29udGVudFRlc3QsIE9PTWluQnVmZmVyKQogLy8v
IFRlc3QgcmVhY3Rpb24gdG8gb3V0LW9mLW1lbW9yeSBjb25kaXRpb24gaW4gYm9vay1rZWVwaW5n
IGRhdGEgc3RydWN0dXJlcwogVEVTVF9GKFRyYWNlQ29udGVudFRlc3QsIE9PTWluQm9va0tlZXBp
bmcpCiB7Ci0gIEFTU0VSVF9FUShmYWxzZSwgdHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIGZhbHNl
LCBmYWxzZSwgLTEsIDEsIFVMT05HX01BWCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICBhbGxfZmVhdHVyZXMpKTsKKyAgQVNTRVJUX0ZBTFNFKHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNl
LCBmYWxzZSwgZmFsc2UsIC0xLCAxLCBVTE9OR19NQVgsCisgICAgICAgICAgICAgICAgICAgICAg
ICAgICBhbGxfZmVhdHVyZXMpKTsKICAgewogICAgIE9wdF90cmFjZV9vYmplY3Qgb3RvKCZ0cmFj
ZSk7CiAgICAgb3Blbl9vYmplY3QoMTAwLCAmdHJhY2UsIHRydWUpOwpAQCAtODQxLDggKzg0MSw4
IEBAIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBPT01pblB1cmdlKQogLyoqIFRlc3QgZmlsdGVy
aW5nIGJ5IGZlYXR1cmUgKi8KIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBGaWx0ZXJpbmdCeUZl
YXR1cmUpCiB7Ci0gIEFTU0VSVF9FUShmYWxzZSwgdHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIGZh
bHNlLCBmYWxzZSwgLTEsIDEsIFVMT05HX01BWCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICBPcHRfdHJhY2VfY29udGV4dDo6TUlTQykpOworICBBU1NFUlRfRkFMU0UodHJhY2Uuc3Rh
cnQodHJ1ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgLTEsIDEsIFVMT05HX01BWCwKKyAgICAgICAg
ICAgICAgICAgICAgICAgICAgIE9wdF90cmFjZV9jb250ZXh0OjpNSVNDKSk7CiAgIHsKICAgICBP
cHRfdHJhY2Vfb2JqZWN0IG90bygmdHJhY2UpOwogICAgIHsKQEAgLTkwNCw4ICs5MDQsOCBAQCBU
RVNUX0YoVHJhY2VDb250ZW50VGVzdCwgRmlsdGVyaW5nQnlGZWF0CiAvKiogVGVzdCBlc2NhcGlu
ZyBvZiBjaGFyYWN0ZXJzICovCiBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgRXNjYXBpbmcpCiB7
Ci0gIEFTU0VSVF9FUShmYWxzZSwgdHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIHRydWUsIGZhbHNl
LCAtMSwgMSwgVUxPTkdfTUFYLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFsbF9m
ZWF0dXJlcykpOworICBBU1NFUlRfRkFMU0UodHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIHRydWUs
IGZhbHNlLCAtMSwgMSwgVUxPTkdfTUFYLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgYWxs
X2ZlYXR1cmVzKSk7CiAgIC8vIEFsbCBBU0NJSSAwLTEyNyBjaGFycyBhcmUgdmFsaWQgVVRGOCBl
bmNvZGluZ3MKICAgY2hhciBhbGxfY2hhcnNbMTMwXTsKICAgZm9yICh1aW50IGM9IDA7IGMgPCBz
aXplb2YoYWxsX2NoYXJzKSAtIDIgOyBjKyspCkBAIC05NDgsOCArOTQ4LDggQEAgVEVTVF9GKFRy
YWNlQ29udGVudFRlc3QsIEVzY2FwaW5nKQogLyoqIFRlc3QgaG93IHRoZSBzeXN0ZW0gaGFuZGxl
cyBub24tVVRGOCBjaGFyYWN0ZXJzLCBhIHZpb2xhdGlvbiBvZiBpdHMgQVBJICovCiBURVNUX0Yo
VHJhY2VDb250ZW50VGVzdCwgTm9uVXRmOCkKIHsKLSAgQVNTRVJUX0VRKGZhbHNlLCB0cmFjZS5z
dGFydCh0cnVlLCBmYWxzZSwgdHJ1ZSwgZmFsc2UsIC0xLCAxLCBVTE9OR19NQVgsCi0gICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgYWxsX2ZlYXR1cmVzKSk7CisgIEFTU0VSVF9GQUxTRSh0
cmFjZS5zdGFydCh0cnVlLCBmYWxzZSwgdHJ1ZSwgZmFsc2UsIC0xLCAxLCBVTE9OR19NQVgsCisg
ICAgICAgICAgICAgICAgICAgICAgICAgICBhbGxfZmVhdHVyZXMpKTsKICAgLyoKICAgICBBIHN0
cmluZyB3aGljaCBzdGFydHMgd2l0aCBpbnZhbGlkIHV0ZjggKHRoZSBmb3VyIGZpcnN0IGJ5dGVz
IGFyZSDDqcOow4TDoCBpbgogICAgIGxhdGluMSkuCkBAIC0xMDAyLDggKzEwMDIsOCBAQCBURVNU
X0YoVHJhY2VDb250ZW50VGVzdCwgTm9uVXRmOCkKICovCiBURVNUX0YoVHJhY2VDb250ZW50VGVz
dCwgSW5kZW50KQogewotICBBU1NFUlRfRVEoZmFsc2UsIHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNl
LCBmYWxzZSwgZmFsc2UsIC0xLCAxLCBVTE9OR19NQVgsCi0gICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgYWxsX2ZlYXR1cmVzKSk7CisgIEFTU0VSVF9GQUxTRSh0cmFjZS5zdGFydCh0cnVl
LCBmYWxzZSwgZmFsc2UsIGZhbHNlLCAtMSwgMSwgVUxPTkdfTUFYLAorICAgICAgICAgICAgICAg
ICAgICAgICAgICAgYWxsX2ZlYXR1cmVzKSk7CiAgIHsKICAgICBPcHRfdHJhY2Vfb2JqZWN0IG90
bygmdHJhY2UpOwogICAgIG9wZW5fb2JqZWN0KDEwMCwgJnRyYWNlLCBmYWxzZSk7Cgo=

--===============0559435002498909475==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   xvi11830h6lljkx3
# target_branch: file:///export/home/didrik/repo/next-mr-opt-\
#   backporting-wl4800/
# testament_sha1: 8bdd10b11971660c09ca022eb1ec396faeefe5fd
# timestamp: 2011-05-27 11:16:53 +0200
# base_revision_id: guilhem.bichot@stripped\
#   hojlvqubkr0so96e
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbPe7zEAAsX/gEAQAIBQd///
f+e+QL////BQBVgeTrRlvT3LVWSqvCSiTaUbU81JtNR+oaaamjTQAPUZAAABKUm0xNpE9U9PVNGm
gAABkMgAAAkhCamCDRo1TJiZEbKep+qNBtQwRkAI9VRiDIBoNAAAAyADQHqaAJJE000jCaKflMRi
j1GyANQyaANAZMPbj0aMwj4zyNHNiRvSHI2PrwSWtgk+dJZ1MeOmlWvpOVaNakeXQ6AIEj56v0Nq
RhG2PKTJmEfL3H0lY9AI2SdppElLLPhYzZXZb7pE3Z6vDRV4ZoejUbDckfTBIb37ODdMxJbz5f78
q2TO45aZYR1MUhyyL1J8OVeTZcW9Y7BvY5+UXQkYJGm7cBzY7UjwKajHpXvS3goAhMlQYhAHxoBe
Mq5HzEdkV7V6XzDas2uo05xR0O9VQUhFIkkyRYcQ2DdE5Kyui/JXIAug570QM27I8FMRcbmnPGAU
DIGIrNWx2DEvsvFQKWLzUdoFmoI57DDa+timM2Z4bmg5wlQ1fVDjEeFkJkHzPDxi3gNqERg8xUsx
mcqG53xqwJ1HxCBJjqUcIpVNhATCYaKqSN8JXKfU0QVlrG9Zp35MC9RhVbTW/G5aiKGlsSUmE+rl
ZlQLmx+RIYsFB0O2oULqsGMKbDJpkWkZlKqt105PZlVzk5pKYsbqF5/USGOiinssMzrrw6aF0YtV
moO7nDLUXurteRWSRkY3Xj6iRFOnaEX49ZFbkYDMQvYPasFQcVGUjgxu2uZX460+G4O8Vmd0xdcP
IcxONJWCqktA0SsYb96+pgR1j40EKgKRrW3JWtr7HI5jB7i2AoyBQiOK2WNJpO61LxMi/FJYtfvU
cRrpIyba1+rgD0LogmOmso8y8Iq1nikfgb8eN2bt629Hj0xCCXxBTEkj7JSxMMzcPzBgU38chMC8
UtFGeAOiILxAXUF9QOykBSyISRBkQjehCFMBYIEL9pXWCMHYMHtLeuGgYXhyTBy8tvnzgHh1OSNx
ZW8LRuHGYAwe4AIXT7ffdWiV8Ui9ViOwccMn+52wO2V8duoK+5VOEpwtLemPrvDHklB2TBhEpmGO
vWwQzAppF+XNratXs3GotoproH/IktKYJecvmg9vpNJ4nY0MksmGGSGSGXAhIZIbM3ZZ5P2+UKR+
45xmbNNKF5wjOcrrDYqbolYZNmLKy78NPycL5ABt55Jl6OPo4nkWLoR1UCNdMWYfeMGV4TT3XrLs
BebEghiM4ic+77p2LKcffcRc0I1nBRxSYKbBMwgz47QdUpgltsQoaBNsgYBdLMvLWk+hxFBhqY3h
GQ9AfFmYrKSvI10Aou0gwwGn+3YpFj5tsaJ6qMQNUtgH4F2moK8YUvMbG1PSOmRiSGFNMLNpeI9Q
nrAATwWwRIGY61mU3FeV5nqpIfh7KXSTJNcXVJhKriraqVUlR07LxdR2dXecVh3W93auSFiDncRL
ebmG77LEp/NIcD1jHLbUF2e3BmTjv5IPhzU6KJ19GL6TF696gajUVvSqT07IAMknbp0ViPNr9O4m
WdsdQFqkXT36SqkMUKCTLfCRdz91PRPYZwAygUbGLMQMpK3sVK7khiKLeTJSacqRF+afv1zGypK2
0LIKooCeNdjj584c3z7ouux2DF5P0kRodcAxK8qSGTqE9Ik9YzGIh3E3UuKIlwD77nXZjwEXloZi
0Ditel3nFU7vAy8bUVFuXjrWrMKKf4u5IpwoSFnvd5iA


--===============0559435002498909475==--