From: Magnus Blåudd
Date: August 5 2010 8:58am
Subject: bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:3666 to 3667) WL#5508
List-Archive: http://lists.mysql.com/commits/115064
Message-Id: <20100805085819.26EBB1340DA@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3171358566751090090=="

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

IDM2NjcgTWFnbnVzIEJsw6V1ZGQJMjAxMC0wOC0wNQogICAgICBXTCM1NTA4IFNFQUdVTEw6IE1v
dmUgTkRCIHZlcnNpb24gY29uZmlndXJhdGlvbiBkb3duIGludG8gc3RvcmFnZS9uZGIKICAgICAg
IC0gSW1wcm92ZSBjb21tZW50cyBhbmQgZ3JvdXAgZGVmaW5lcyB0b2dldGhlcgoKICAgIG1vZGlm
aWVkOgogICAgICBzdG9yYWdlL25kYi9pbmNsdWRlL25kYl92ZXJzaW9uLmguaW4KICAgICAgc3Rv
cmFnZS9uZGIvbmRiX2NvbmZpZ3VyZS5tNAogMzY2NiBNYWdudXMgQmzDpXVkZAkyMDEwLTA4LTA0
CiAgICAgIFdMIzU1MDggU0VBR1VMTDogTW92ZSBOREIgdmVyc2lvbiBjb25maWd1cmF0aW9uIGRv
d24gaW50byBzdG9yYWdlL25kYgogICAgICAgLSBDYWxjdWxhdGUgdGhlIE5EQl9NWVNRTF9WRVJT
SU9OX1hYIHZhcmlhYmxlcyBmcm9tIE1ZU1FMX1ZFUlNJT05fSUQKICAgICAgICAgdGh1cyByZW1v
dmluZyB0aGUgbmVlZCBmb3Igb3VyIGJ1aWxkIHN5c3RlbXMgdG8gZXh0cmFjdCBpdC4KICAgICAg
IC0gUmVtb3ZlIGF1dG9tYWtlIGFuZCBjbWFrZSBjb2RlIHRvIGV4dHJhY3QgTkRCX01ZU1FMX1ZF
UlNJT05fWFgKICAgICAgIC0gQWRkIHRlc3QgdGhhdCBOREJfTVlTUUxfVkVSU0lPTl9YWCBtYXBz
IGJhY2t0byBNWVNRTF9WRVJTSU9OX0lECiAgICAgICAtIFJlbW92ZSBOREJfTVlTUUxfVkVSU0lP
Tl9YWCBmcm9tIG15X2NvbmZpZy5oL2NvbmZpZy5oCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3Jh
Z2UvbmRiL2luY2x1ZGUvQ01ha2VMaXN0cy50eHQKICAgICAgc3RvcmFnZS9uZGIvaW5jbHVkZS9u
ZGJfdmVyc2lvbi5oLmluCiAgICAgIHN0b3JhZ2UvbmRiL25kYl9jb25maWd1cmUubTQKICAgICAg
c3RvcmFnZS9uZGIvc3JjL2NvbW1vbi91dGlsL3ZlcnNpb24uY3BwCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL25kYi9pbmNsdWRlL25kYl92ZXJzaW9uLmguaW4nCi0tLSBhL3N0b3JhZ2UvbmRi
L2luY2x1ZGUvbmRiX3ZlcnNpb24uaC5pbgkyMDEwLTA4LTA0IDE0OjAwOjI0ICswMDAwCisrKyBi
L3N0b3JhZ2UvbmRiL2luY2x1ZGUvbmRiX3ZlcnNpb24uaC5pbgkyMDEwLTA4LTA1IDA4OjEyOjMx
ICswMDAwCkBAIC0yMiwyMiArMjIsMzggQEAKICNpbmNsdWRlIDxuZGJfdHlwZXMuaD4KICNpbmNs
dWRlIDxteXNxbF92ZXJzaW9uLmg+CiAKLS8qIE5EQiB2ZXJzaW9uIG51bWJlcnMgYW5kIHN0YXR1
cyAqLworLyoKKyAgQ3JlYXRlcyBhIGNvbXBvc2l0ZSB2ZXJzaW9uIG51bWJlciBmcm9tIG1ham9y
LCBtaW5vciBhbmQgYnVpbGQKKyAgZXg6IE5EQl9NQUtFX1ZFUlNJT04oNSwxLDQ3KSA9PiAweDAw
MDUwMTQ3CisqLworI2RlZmluZSBOREJfTUFLRV9WRVJTSU9OKEEsQixDKSAoKChBKSA8PCAxNikg
fCAoKEIpIDw8IDgpICB8ICgoQykgPDwgMCkpCisKKy8qIE5EQiB2ZXJzaW9uIG51bWJlcnMgYW5k
IHN0YXR1cyAgKi8KICNkZWZpbmUgTkRCX1ZFUlNJT05fTUFKT1IgQE5EQl9WRVJTSU9OX01BSk9S
QAogI2RlZmluZSBOREJfVkVSU0lPTl9NSU5PUiBATkRCX1ZFUlNJT05fTUlOT1JACiAjZGVmaW5l
IE5EQl9WRVJTSU9OX0JVSUxEIEBOREJfVkVSU0lPTl9CVUlMREAKICNkZWZpbmUgTkRCX1ZFUlNJ
T05fU1RBVFVTICJATkRCX1ZFUlNJT05fU1RBVFVTQCIKIAotLyogTXlTUUwgU2VydmVyIHZlcnNp
b24gbnVtYmVycyBleHRyYWN0ZWQgZnJvbSBNWVNRTF9WRVJTSU9OX0lEICovCisvKiBDb21wb3Np
dGUgdmVyc2lvbiBudW1iZXIgZm9yIE5EQiAqLworI2RlZmluZSBOREJfVkVSU0lPTl9EIFwKKyAg
TkRCX01BS0VfVkVSU0lPTihOREJfVkVSU0lPTl9NQUpPUiwgTkRCX1ZFUlNJT05fTUlOT1IsIE5E
Ql9WRVJTSU9OX0JVSUxEKQorCisvKgorICBUaGUgdmVyc2lvbiBudW1iZXIgb2YgdGhlIE15U1FM
IFNlcnZlciB0aGF0IE5EQiBpcyBidWlsdAorICB3aXRoLiBFeHRyYWN0ZWQgZnJvbSBNWVNRTF9W
RVJTSU9OX0lECisqLwogI2RlZmluZSBOREJfTVlTUUxfVkVSU0lPTl9NQUpPUiAoKE1ZU1FMX1ZF
UlNJT05fSUQgLyAxMDAwMCkgJSAxMDApCiAjZGVmaW5lIE5EQl9NWVNRTF9WRVJTSU9OX01JTk9S
ICgoTVlTUUxfVkVSU0lPTl9JRCAvMTAwKSAlIDEwMCkKICNkZWZpbmUgTkRCX01ZU1FMX1ZFUlNJ
T05fQlVJTEQgKE1ZU1FMX1ZFUlNJT05fSUQgJSAxMDApCiAKLSNkZWZpbmUgTkRCX01BS0VfVkVS
U0lPTihBLEIsQykgKCgoQSkgPDwgMTYpIHwgKChCKSA8PCA4KSAgfCAoKEMpIDw8IDApKQorLyog
Q29tcG9zaXRlIHZlcnNpb24gbnVtYmVyIGZvciBNWVNRTCBTZXJ2ZXIgKi8KKyNkZWZpbmUgTkRC
X01ZU1FMX1ZFUlNJT05fRCBcCisgIE5EQl9NQUtFX1ZFUlNJT04oTkRCX01ZU1FMX1ZFUlNJT05f
TUFKT1IsIFwKKyAgICAgICAgICAgICAgICAgICBOREJfTVlTUUxfVkVSU0lPTl9NSU5PUiwgXAor
ICAgICAgICAgICAgICAgICAgIE5EQl9NWVNRTF9WRVJTSU9OX0JVSUxEKQogCi0jZGVmaW5lIE5E
Ql9NWVNRTF9WRVJTSU9OX0QgTkRCX01BS0VfVkVSU0lPTihOREJfTVlTUUxfVkVSU0lPTl9NQUpP
UiwgTkRCX01ZU1FMX1ZFUlNJT05fTUlOT1IsIE5EQl9NWVNRTF9WRVJTSU9OX0JVSUxEKQotI2Rl
ZmluZSBOREJfVkVSU0lPTl9EIE5EQl9NQUtFX1ZFUlNJT04oTkRCX1ZFUlNJT05fTUFKT1IsIE5E
Ql9WRVJTSU9OX01JTk9SLCBOREJfVkVSU0lPTl9CVUlMRCkKICNkZWZpbmUgTkRCX1ZFUlNJT05f
U1RSSU5HX0JVRl9TWiAxMDAKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiBleHRlcm4gIkMiIHsKICNl
bmRpZgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvbmRiL25kYl9jb25maWd1cmUubTQnCi0t
LSBhL3N0b3JhZ2UvbmRiL25kYl9jb25maWd1cmUubTQJMjAxMC0wOC0wNCAxNDowMDoyNCArMDAw
MAorKysgYi9zdG9yYWdlL25kYi9uZGJfY29uZmlndXJlLm00CTIwMTAtMDgtMDUgMDg6MTI6MzEg
KzAwMDAKQEAgLTEsNCArMSw1IEBACi0jIFRoZSB2ZXJzaW9uIG51bWJlciBvZiBOREIKKyMgVGhl
IE5EQiB2ZXJzaW9uIG51bWJlciBhbmQgc3RhdHVzLgorIyBTaG91bGQgYmUgdXBkYXRlZCB3aGVu
IGNyZWF0aW5nIGEgbmV3IE5EQiB2ZXJzaW9uCiBOREJfVkVSU0lPTl9NQUpPUj03CiBOREJfVkVS
U0lPTl9NSU5PUj0wCiBOREJfVkVSU0lPTl9CVUlMRD0xNwoK

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 7fd833eb7338a5e9da8f33267ecee9ca1d855bb7
# timestamp: 2010-08-05 10:58:19 +0200
# base_revision_id: magnus.blaudd@stripped\
#   ij03bsllharl30ki
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcipE+kAAo/flAAQ2Hf/936/
v6S////0AgAIAFAF716YHLbXZOo7mnFrQ4SiJpomp4Qank000TTaSejU00PSG1MTQxA0BKQgTwk8
lPQTRoaAAAAAABoDhppkYjCaYCGATTCMExMhpkaGgEiiZKemqeym1NqhtEeKYh+qPUaZppAyNqDQ
0ASRAk00yNJN6amU/SmJ6CTMgnqHqAaHqe1Q0JXi5fpMQOgPDx7P2ysp6zEovDz4VwzpzXFF2hlK
aJ6bnCOYBgk4xScYxxAc1sKo+hOXn2T9J+WhhmS6ssvmF9FkRNkje2BMij1yQOVmyDK4idCro1pS
1as5Vbsy+Xq5Y390SqUKh4N26zAlQcRb9McB3EMW3Ofh4qCk7fTVFkOyma84nCPGoPNzAb4zyyIo
K+bMt+qh+ua3dplNUvUjVRDnM6pP1KcGKooy7Guk3m+rq24fahglFO4M/spkknsMTpQt5DbFFxE8
stxYB7zLfvphhSIlagJKfIfUjBGsnbNVHLIRexnY/y6KJHQEy5kJwB9MIxHIpeaGD0oiOnAjKCEw
D6/WSzBFUo/vmjQUYKDO7qA2btgA/XmSXdWZR4m35SLDNyynWSLQM8JVRpNHtCxUy7s9RgX2jWac
DkyiWljvYMa3DuA2ZyfxDPqHQoDmDgck4ovH8CWs16oI+RI1R4qlg4fxtS6wwIVmMCZpimlnKSTL
zhIIRw3CvLAXUVvcvA+jZSZCe+CVoC7iyUJlsHDadG4Lygb3K1Mcw7Swq+E5FjsBZqbAvtK9iIvu
tXhpi0nrccTktZpUCadaXWNIsI8yqckNT0hH45giJHZeMnbYrUasmdDTIwolGZ4uNAXTcJyVNZWV
AN1yTS2li0L0ZoQAfoLDZJa2JLPAnIppi1eh7iwoUvAqcmZY7DPecOGz4jkte+DbYwGqGTKooEsY
k6wVSqdKkKdx9KyrUno3TEai6Iwlh7DZ5ZCXIdW0WwUcK7W22G/skCponR1+szceIg8s/FC/gKvG
riaSpClIXmf1ZoKoozAUYZjvc4gwjybU7jtURQMhauLOxKgMqFPsQu7saIo5T9WoVt4pBjSmDGGI
HvDbbfP5OM4CLS1m3pkElWRF5vQcp6iroOg2ED3EZJ6dFB8u9k8Y3EqJX0iJvF7KirThIqwpnRMa
GBVyZIOnEXiWacnVaRPDEyyRsZZvmMXxEqM/uRM1iJThSQyE3xbQd1lneMyK3SYhEojU2LyRWFpm
qWSdVUXFYVaW8tZj9HkYdsYWtzYCJCYRNeqFA+toBH4JXU9GYPxDVcsiMrLrEdDRfCfYkytMLUs2
1SmckuLyGChgxxBEgRuos1ipaoGhPoSUY7CQX9KN9Vfysi9MKXlgvBDXlmD0snNI2/EndrsMNCI7
poluwDsvyvKAQIHX1YLeOyc0q0+ZwNJWFh6pxCtj9nh5WoL2SU7DIR4edGJmE8i9B14voT7W56QG
GjRViKNa8c+5BfNCvgsiKPY4miY7FVUiYaZ9NPw+Bz4U2lTCVOVDrZW5t7zJHNhjsA9W+oBtpd0e
5GKNxkFiNKK4dYDLgMBK7OwvGUo3rAN+tFLnO5Vc3IktKfiR2mCZDRovVgshdO0nHzlZOaguqN8Y
D3H33pYop1iTSrJ0MGizNut5iBQqXTAgUZwMAI95NptDJi9qSda7t7ydzEA4jZUQDORKGfoqAgul
0qT9L+teiq3UJzGLOooOcmDp1ywI6N7cY9eIkN4wjcZjZYmRkzsi9wOEjHZbSpK7q1r3Et/hRGhV
28xPVk+Y4ytCq1QILOZSNfg0xkpJJkuGiN/E1aVAVNMK1AzBv5kX+s4MzXWmI42hFp9BJ8Td0bR+
HQQc7A2LcYKGU5HK9wZ/ACqBfLHm1EDRbSwB1axRgroawIGP+xEruG0u21C0CULXXOckmYSurO31
GYkpGYDeq+UVRjIq5zQd/oKm7B0eObQzHsuyMOG1QFGTEBge4ryFp/Uf4u5IpwoSGRUifSA=


--===============3171358566751090090==--