From: Tor Didriksen
Date: May 27 2011 8:56am
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3317)
List-Archive: http://lists.mysql.com/commits/138290
Message-Id: <20110527085606.A0A5E24C@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3160885972968478169=="

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

I0F0IGZpbGU6Ly8vZXhwb3J0L2hvbWUvZGlkcmlrL3JlcG8vbmV4dC1tci1vcHQtYmFja3BvcnRp
bmctd2w0ODAwLyBiYXNlZCBvbiByZXZpZDp0b3IuZGlkcmlrc2VuQG9yYWNsZS5jb20tMjAxMTA1
MjcwODM0MDMtZXVzeHFtcXl3aXlkaXVhcwoKIDMzMTcgVG9yIERpZHJpa3NlbgkyMDExLTA1LTI3
CiAgICAgIHMvQVNTRVJUX0VRKGZhbHNlLCAvQVNTRVJUX0ZBTFNFL2cKICAgICAgCiAgICAgIGJl
Y2F1c2UgaXQgaXMgInRoZSByaWdodCB0aGluZyIKICAgICAgYW5kIGJlY2F1c2UgaXQgZG9lcyBu
b3QgY29tcGlsZSB3aXRoIGdjYyA0LjUuMQogICAgICAKICAgICAgdW5pdHRlc3QvZ3VuaXQvb3B0
X3RyYWNlLXQuY2M6MzM4OjE1NjogCiAgICAgIGVycm9yOiBjb252ZXJ0aW5nIGZhbHNlIHRvIHBv
aW50ZXIgdHlwZSBmb3IgYXJndW1lbnQgMSBvZiAKICAgICAgY2hhciB0ZXN0aW5nOjppbnRlcm5h
bDo6SXNOdWxsTGl0ZXJhbEhlbHBlcih0ZXN0aW5nOjppbnRlcm5hbDo6U2VjcmV0KikKCiAgICBt
b2RpZmllZDoKICAgICAgdW5pdHRlc3QvZ3VuaXQvb3B0X3RyYWNlLXQuY2MKPT09IG1vZGlmaWVk
IGZpbGUgJ3VuaXR0ZXN0L2d1bml0L29wdF90cmFjZS10LmNjJwotLS0gYS91bml0dGVzdC9ndW5p
dC9vcHRfdHJhY2UtdC5jYwkyMDExLTA1LTA2IDEyOjAyOjE1ICswMDAwCisrKyBiL3VuaXR0ZXN0
L2d1bml0L29wdF90cmFjZS10LmNjCTIwMTEtMDUtMjcgMDg6NTY6MDIgKzAwMDAKQEAgLTMzNSw4
ICszMzUsOCBAQCBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgQnVnZ3lPYmplY3QpCiAvKiogVGVz
dCByZWFjdGlvbiB0byBtYWxmb3JtZWQgSlNPTiAoYXJyYXkgd2l0aCB2YWx1ZSB3aXRoIGtleSkg
Ki8KIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBCdWdneUFycmF5KQogewotICBBU1NFUlRfRVEo
ZmFsc2UsIHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCB0cnVlLCBmYWxzZSwgLTEsIDEsIFVMT05H
X01BWCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbGxfZmVhdHVyZXMpKTsKKyAg
QVNTRVJUX0ZBTFNFKHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCB0cnVlLCBmYWxzZSwgLTEsIDEs
IFVMT05HX01BWCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGFsbF9mZWF0dXJlcykpOwog
ICB7CiAgICAgT3B0X3RyYWNlX29iamVjdCBvdG8oJnRyYWNlKTsKICAgICB7CkBAIC02MTEsOCAr
NjExLDggQEAgVEVTVF9GKFRyYWNlQ29udGVudFRlc3QsIE9mZnNldCkKIC8qKiBUZXN0IHRydW5j
YXRpb24gYnkgbWF4X21lbV9zaXplICovCiBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgTWF4TWVt
U2l6ZSkKIHsKLSAgQVNTRVJUX0VRKGZhbHNlLCB0cmFjZS5zdGFydCh0cnVlLCBmYWxzZSwgZmFs
c2UsIGZhbHNlLCAtMSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAxLCAxMDAwIC8q
IG1heF9tZW1fc2l6ZSAqLywgYWxsX2ZlYXR1cmVzKSk7CisgIEFTU0VSVF9GQUxTRSh0cmFjZS5z
dGFydCh0cnVlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCAtMSwKKyAgICAgICAgICAgICAgICAgICAg
ICAgICAgIDEsIDEwMDAgLyogbWF4X21lbV9zaXplICovLCBhbGxfZmVhdHVyZXMpKTsKICAgLyog
bWFrZSBhICJsb25nIiB0cmFjZSAqLwogICB7CiAgICAgT3B0X3RyYWNlX29iamVjdCBvdG8oJnRy
YWNlKTsKQEAgLTY1MSw4ICs2NTEsOCBAQCBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgTWF4TWVt
U2l6ZSkKIC8qKiBUZXN0IGhvdyB0cnVuY2F0aW9uIGJ5IG1heF9tZW1fc2l6ZSBhZmZlY3RzIG5l
eHQgdHJhY2VzICovCiBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgTWF4TWVtU2l6ZTIpCiB7Ci0g
IEFTU0VSVF9FUShmYWxzZSwgdHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwg
LTIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMiwgMjEgLyogbWF4X21lbV9zaXpl
ICovLCBhbGxfZmVhdHVyZXMpKTsKKyAgQVNTRVJUX0ZBTFNFKHRyYWNlLnN0YXJ0KHRydWUsIGZh
bHNlLCBmYWxzZSwgZmFsc2UsIC0yLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgMiwgMjEg
LyogbWF4X21lbV9zaXplICovLCBhbGxfZmVhdHVyZXMpKTsKICAgLyogbWFrZSBhICJsb25nIiB0
cmFjZSAqLwogICB7CiAgICAgT3B0X3RyYWNlX29iamVjdCBvdG8oJnRyYWNlKTsKQEAgLTY2MCw4
ICs2NjAsOCBAQCBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgTWF4TWVtU2l6ZTIpCiAgIH0KICAg
dHJhY2UuZW5kKCk7CiAgIC8qIEEgc2Vjb25kIHNpbWlsYXIgdHJhY2UgKi8KLSAgQVNTRVJUX0VR
KGZhbHNlLCB0cmFjZS5zdGFydCh0cnVlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCAtMiwKLSAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAyLCAyMSwgYWxsX2ZlYXR1cmVzKSk7CisgIEFTU0VS
VF9GQUxTRSh0cmFjZS5zdGFydCh0cnVlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCAtMiwKKyAgICAg
ICAgICAgICAgICAgICAgICAgICAgIDIsIDIxLCBhbGxfZmVhdHVyZXMpKTsKICAgewogICAgIE9w
dF90cmFjZV9vYmplY3Qgb3RvKCZ0cmFjZSk7CiAgICAgb3RvLmFkZF9hbG51bSgic29tZSBrZXky
IiwgIm1ha2UgaXQgbG9uZyIpOwpAQCAtNjg3LDggKzY4Nyw4IEBAIFRFU1RfRihUcmFjZUNvbnRl
bnRUZXN0LCBNYXhNZW1TaXplMikKICAgICAzcmQgdHJhY2U7IHRoZSBmaXJzdCBvbmUgc2hvdWxk
IGF1dG9tYXRpY2FsbHkgYmUgcHVyZ2VkLCB0aHVzIHRoZSAzcmQKICAgICBzaG91bGQgaGF2ZSBh
IGJpdCBvZiByb29tLgogICAqLwotICBBU1NFUlRfRVEoZmFsc2UsIHRyYWNlLnN0YXJ0KHRydWUs
IGZhbHNlLCBmYWxzZSwgZmFsc2UsIC0yLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
IDIsIDIxLCBhbGxfZmVhdHVyZXMpKTsKKyAgQVNTRVJUX0ZBTFNFKHRyYWNlLnN0YXJ0KHRydWUs
IGZhbHNlLCBmYWxzZSwgZmFsc2UsIC0yLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgMiwg
MjEsIGFsbF9mZWF0dXJlcykpOwogICB7CiAgICAgT3B0X3RyYWNlX29iamVjdCBvdG8oJnRyYWNl
KTsKICAgICBvdG8uYWRkX2FsbnVtKCJzb21lIGtleTMiLCAibWFrZSBpdCBsb25nIik7CkBAIC03
NDksOCArNzQ5LDggQEAgdm9pZCBvcGVuX29iamVjdCh1aW50IGNvdW50LCBPcHRfdHJhY2VfYwog
Ly8vIFRlc3QgcmVhY3Rpb24gdG8gb3V0LW9mLW1lbW9yeSBjb25kaXRpb24gaW4gdHJhY2UgYnVm
ZmVyCiBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgT09NaW5CdWZmZXIpCiB7Ci0gIEFTU0VSVF9F
UShmYWxzZSwgdHJhY2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgLTEsIDEsIFVM
T05HX01BWCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbGxfZmVhdHVyZXMpKTsK
KyAgQVNTRVJUX0ZBTFNFKHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIC0x
LCAxLCBVTE9OR19NQVgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICBhbGxfZmVhdHVyZXMp
KTsKICAgewogICAgIE9wdF90cmFjZV9vYmplY3Qgb3RvKCZ0cmFjZSk7CiAgICAgewpAQCAtNzc3
LDggKzc3Nyw4IEBAIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBPT01pbkJ1ZmZlcikKIC8vLyBU
ZXN0IHJlYWN0aW9uIHRvIG91dC1vZi1tZW1vcnkgY29uZGl0aW9uIGluIGJvb2sta2VlcGluZyBk
YXRhIHN0cnVjdHVyZXMKIFRFU1RfRihUcmFjZUNvbnRlbnRUZXN0LCBPT01pbkJvb2tLZWVwaW5n
KQogewotICBBU1NFUlRfRVEoZmFsc2UsIHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCBmYWxzZSwg
ZmFsc2UsIC0xLCAxLCBVTE9OR19NQVgsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
YWxsX2ZlYXR1cmVzKSk7CisgIEFTU0VSVF9GQUxTRSh0cmFjZS5zdGFydCh0cnVlLCBmYWxzZSwg
ZmFsc2UsIGZhbHNlLCAtMSwgMSwgVUxPTkdfTUFYLAorICAgICAgICAgICAgICAgICAgICAgICAg
ICAgYWxsX2ZlYXR1cmVzKSk7CiAgIHsKICAgICBPcHRfdHJhY2Vfb2JqZWN0IG90bygmdHJhY2Up
OwogICAgIG9wZW5fb2JqZWN0KDEwMCwgJnRyYWNlLCB0cnVlKTsKQEAgLTg0MSw4ICs4NDEsOCBA
QCBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgT09NaW5QdXJnZSkKIC8qKiBUZXN0IGZpbHRlcmlu
ZyBieSBmZWF0dXJlICovCiBURVNUX0YoVHJhY2VDb250ZW50VGVzdCwgRmlsdGVyaW5nQnlGZWF0
dXJlKQogewotICBBU1NFUlRfRVEoZmFsc2UsIHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCBmYWxz
ZSwgZmFsc2UsIC0xLCAxLCBVTE9OR19NQVgsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgT3B0X3RyYWNlX2NvbnRleHQ6Ok1JU0MpKTsKKyAgQVNTRVJUX0ZBTFNFKHRyYWNlLnN0YXJ0
KHRydWUsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIC0xLCAxLCBVTE9OR19NQVgsCisgICAgICAgICAg
ICAgICAgICAgICAgICAgICBPcHRfdHJhY2VfY29udGV4dDo6TUlTQykpOwogICB7CiAgICAgT3B0
X3RyYWNlX29iamVjdCBvdG8oJnRyYWNlKTsKICAgICB7CkBAIC05MDQsOCArOTA0LDggQEAgVEVT
VF9GKFRyYWNlQ29udGVudFRlc3QsIEZpbHRlcmluZ0J5RmVhdAogLyoqIFRlc3QgZXNjYXBpbmcg
b2YgY2hhcmFjdGVycyAqLwogVEVTVF9GKFRyYWNlQ29udGVudFRlc3QsIEVzY2FwaW5nKQogewot
ICBBU1NFUlRfRVEoZmFsc2UsIHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCB0cnVlLCBmYWxzZSwg
LTEsIDEsIFVMT05HX01BWCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbGxfZmVh
dHVyZXMpKTsKKyAgQVNTRVJUX0ZBTFNFKHRyYWNlLnN0YXJ0KHRydWUsIGZhbHNlLCB0cnVlLCBm
YWxzZSwgLTEsIDEsIFVMT05HX01BWCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGFsbF9m
ZWF0dXJlcykpOwogICAvLyBBbGwgQVNDSUkgMC0xMjcgY2hhcnMgYXJlIHZhbGlkIFVURjggZW5j
b2RpbmdzCiAgIGNoYXIgYWxsX2NoYXJzWzEzMF07CiAgIGZvciAodWludCBjPSAwOyBjIDwgc2l6
ZW9mKGFsbF9jaGFycykgLSAyIDsgYysrKQpAQCAtOTQ4LDggKzk0OCw4IEBAIFRFU1RfRihUcmFj
ZUNvbnRlbnRUZXN0LCBFc2NhcGluZykKIC8qKiBUZXN0IGhvdyB0aGUgc3lzdGVtIGhhbmRsZXMg
bm9uLVVURjggY2hhcmFjdGVycywgYSB2aW9sYXRpb24gb2YgaXRzIEFQSSAqLwogVEVTVF9GKFRy
YWNlQ29udGVudFRlc3QsIE5vblV0ZjgpCiB7Ci0gIEFTU0VSVF9FUShmYWxzZSwgdHJhY2Uuc3Rh
cnQodHJ1ZSwgZmFsc2UsIHRydWUsIGZhbHNlLCAtMSwgMSwgVUxPTkdfTUFYLAotICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIGFsbF9mZWF0dXJlcykpOworICBBU1NFUlRfRkFMU0UodHJh
Y2Uuc3RhcnQodHJ1ZSwgZmFsc2UsIHRydWUsIGZhbHNlLCAtMSwgMSwgVUxPTkdfTUFYLAorICAg
ICAgICAgICAgICAgICAgICAgICAgICAgYWxsX2ZlYXR1cmVzKSk7CiAgIC8qCiAgICAgQSBzdHJp
bmcgd2hpY2ggc3RhcnRzIHdpdGggaW52YWxpZCB1dGY4ICh0aGUgZm91ciBmaXJzdCBieXRlcyBh
cmUgw6nDqMOEw6AgaW4KICAgICBsYXRpbjEpLgpAQCAtMTAwMiw4ICsxMDAyLDggQEAgVEVTVF9G
KFRyYWNlQ29udGVudFRlc3QsIE5vblV0ZjgpCiAqLwogVEVTVF9GKFRyYWNlQ29udGVudFRlc3Qs
IEluZGVudCkKIHsKLSAgQVNTRVJUX0VRKGZhbHNlLCB0cmFjZS5zdGFydCh0cnVlLCBmYWxzZSwg
ZmFsc2UsIGZhbHNlLCAtMSwgMSwgVUxPTkdfTUFYLAotICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIGFsbF9mZWF0dXJlcykpOworICBBU1NFUlRfRkFMU0UodHJhY2Uuc3RhcnQodHJ1ZSwg
ZmFsc2UsIGZhbHNlLCBmYWxzZSwgLTEsIDEsIFVMT05HX01BWCwKKyAgICAgICAgICAgICAgICAg
ICAgICAgICAgIGFsbF9mZWF0dXJlcykpOwogICB7CiAgICAgT3B0X3RyYWNlX29iamVjdCBvdG8o
JnRyYWNlKTsKICAgICBvcGVuX29iamVjdCgxMDAsICZ0cmFjZSwgZmFsc2UpOwoK

--===============3160885972968478169==
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\
#   1cyz8q9rsc53xve1
# target_branch: file:///export/home/didrik/repo/next-mr-opt-\
#   backporting-wl4800/
# testament_sha1: 8819ce85b2919ae75e93b7d3324238568aa2316f
# timestamp: 2011-05-27 10:56:06 +0200
# base_revision_id: tor.didriksen@stripped\
#   eusxqmqywiydiuas
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfHte+8AArh/gEAQAIBQd///
f+e+QL////BQBTi9dxAXeXvPbpOzN24SSI0KZ6IxTTKbMqenqjyR6IPU0yeo0eoaD1AkkmmJppoK
eo0ZT0mmmQA000AAAASQiaJgpqb00p6nqNDTah6h6QDEAMgA2qUaAAAAAAAAAAGmgEkgmgRGp+1U
21T2qemp4kek02jU0eobQmgaBf0YbdjMI+s1sGxSONIcjF8LklgwSfOqWdZfr2bK2uqnSubaEjp2
ugCBI67Oo0pGEaY6ZMmYR9vkdkqPUBHFJ2mkSUuLw6qM2VurVbIm7PW8NFbwzQ9TQaNaR5RSG8cn
O2mUSVpx5cZ5pTAz6LIvuYg9xM/GoOxX03tczc45guY+bqutItSL8mQDqY1JHQUVFvSvFKwE8B6Z
KAw9AH2gBjICcp6z8iL3+dT5rHjb9eWpthyV7mEwikXCGSMTYNxNxwMssZU562AFJvEImZYuCip1
QTSX4mFBkDGnLxuch5EDz81gUrVs3aj3Dc+JjR8WJ3zZnhuesYDhJKhbPdKBjfW6ZB1m/zxbkNWI
jCqmMEyl1vHPlXtOzRKZnbdea2l5zNHEpkLIM878z9cCRhngxNcKkK179jAuk/OU1JojWEXUegdh
pALpwLk/qlwsbVI13bN1ploSaCa+2mdRS1iXSuTZsb+Q2wfxNUoTwvN1igbBqV1L3Vtc145zjg0k
MmrjiRtSNCgrypYSE6GK3NDlGtuL6iydYx1DPzMmiNChAw1cDSwqnBjXWLaWIHb2pZaWKwcccpzV
KlDSZadDrzJRpIenmx5N4oVlAacqQK5U/woWNfcZVOAfQbE1uxia7bNOXbcccrP2Ke3PPCmOjc28
vUtTXtdZreotiCY6aTnQLQlS0g2pHYXY528jm5207emURHAFCpIbxShQRjGZPT1iQ046EMSPIUX9
BwOqQ09BpsL7YZ4qBt2kRBEEQ/9iGRwdg4I9hJjIU51OYl+UflHMMLg8M8jd0AHbtckesizWPDEN
8MxMGDcAEtUNfwyUoosmSOCtVQj3Djf7Ozf7X9284U1/K/B4lSHYN1vwN4qUIaHqont29olxc7iW
/mzZ7MCkkY8HlavYK512epMvgrVvHSHqGUcBHKdKwiC9neNsMTnaxklmwwyQyQy1EJDJDaz+ok2z
KOTI138r7jmdGOINOjLCcRtOygjq8DKxdJQ9tXk45RsKEhvWZ0y8+Gu95JjjjLPSI5a5Mw+42JwT
gEZUT9rE736QXkyQPNgjbUfyyFTK8r4SIkiieFm6a2s6AZ0MHPmwpQpC6Q6qsli5XCHzuJgWbUx1
ymbiFL9bK6009LoZQur9QMTN/+1PmnqlYdeU9JmBtCR4mcKqgqeVMaU9I6aSpIZQuwcIaTgAleIe
zHKpkeIllrNboPHVWnXGlqYQ1ClxaD7nCleoST1Bycy6HJ9+rtMeejXzoVAdbiBTs2DfGMREP8kO
B6xDlf6cujJmZk49+mV8u3m0TwX0Y7hdGIx4dSipi4uHvEOTVgDJJ2yKMYjDi13ESWt+hIrUCyM8
0OwVSQ4kSEmU3pFvVwo2VioyGAAWLBIr1MceIGVhkatb0hiCL1PlzmbsUiVmsNuNo2kHznGwkiAJ
1lYuHz4Q5lPxRbbhpGLicLmKDPwmFqzL0hk9ahIserS0RHeQgstAlu+vsctGKYi0vXIK0HBj5l6L
JGHqK90VzIcLKt1qyLtWwVQoyhRgf8XckU4UJDx7XvvA


--===============3160885972968478169==--