From: Jon Olav Hauglid
Date: January 4 2011 2:23pm
Subject: bzr commit into mysql-trunk branch (jon.hauglid:3454) Bug#58996
List-Archive: http://lists.mysql.com/commits/127876
X-Bug: 58996
Message-Id: <201101041424.p04EOT3p016409@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6377679466130023755=="

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

I0F0IGZpbGU6Ly8vZXhwb3J0L2hvbWUveC9teXNxbC10cnVuay1idWc1ODk5Ni8gYmFzZWQgb24g
cmV2aWQ6bWFyYy5hbGZmQG9yYWNsZS5jb20tMjAxMTAxMDQwODA2NTQteWFiN2I4bXhlbmc5OThp
YQoKIDM0NTQgSm9uIE9sYXYgSGF1Z2xpZAkyMDExLTAxLTA0CiAgICAgIEJ1ZyAjNTg5OTYgU0hP
VyBDUkVBVEUgVFJJR0dFUiBmYWlscyB3aGVuIHN1YmplY3QgdGFibGUgaXMgc2hhZG93ZWQgYnkK
ICAgICAgICAgICAgICAgICBhIHRlbXBvcmFyeSB0YWJsZS4KICAgICAgCiAgICAgIFRoZSBwcm9i
bGVtIHdhcyB0aGF0IFNIT1cgQ1JFQVRFIFRSSUdHRVIgZmFpbGVkIHRvIHNob3cgYSB0YWJsZSB0
cmlnZ2VyCiAgICAgIGlmIGEgdGVtcG9yYXJ5IHRhYmxlIHdpdGggdGhlIHNhbWUgbmFtZSBhcyB0
aGUgdHJpZ2dlciB0YWJsZSBleGlzdGVkLgogICAgICBUaGlzIGV2ZW4gaWYgdGVtcG9yYXJ5IHRh
YmxlcyBjYW5ub3QgaGF2ZSB0cmlnZ2VycyBhbmQgU0hPVyBDUkVBVEUKICAgICAgVFJJR0dFUiBz
cGVjaWZpZXMgdGhlIG5hbWUgb2YgdGhlIHRyaWdnZXIgKG5vdCB0aGUgbmFtZSBvZiB0aGUgdGFi
bGUpLgogICAgICAKICAgICAgVGhpcyBwYXRjaCBmaXhlcyB0aGUgcHJvYmxlbSBieSBmb3JjaW5n
IFNIT1cgQ1JFQVRFIFRSSUdHRVIgdG8gaWdub3JlCiAgICAgIHRlbXBvcmFyeSB0YWJsZXMgd2hl
biB0cnlpbmcgdG8gb3BlbiB0aGUgdGFibGUgZm9yIHdoaWNoIHRoZSB0cmlnZ2VyCiAgICAgIGlz
IGRlZmluZWQuCiAgICAgIAogICAgICBUZXN0IGNhc2UgYWRkZWQgdG8gc2hvd19jaGVjay50ZXN0
LgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3Ivc2hvd19jaGVjay5yZXN1bHQKICAg
ICAgbXlzcWwtdGVzdC90L3Nob3dfY2hlY2sudGVzdAogICAgICBzcWwvc3FsX3Nob3cuY2MKPT09
IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvci9zaG93X2NoZWNrLnJlc3VsdCcKLS0tIGEvbXlz
cWwtdGVzdC9yL3Nob3dfY2hlY2sucmVzdWx0CTIwMTAtMTEtMzAgMTc6NTU6MzYgKzAwMDAKKysr
IGIvbXlzcWwtdGVzdC9yL3Nob3dfY2hlY2sucmVzdWx0CTIwMTEtMDEtMDQgMTQ6MjM6MjUgKzAw
MDAKQEAgLTE1NDAsMyArMTU0MCwxOSBAQCBSRUxFQVNFX0xPQ0soJ3QnKQogw7PDs8Ozw7MKIDEK
IFNFVCBOQU1FUyBsYXRpbjE7CisjCisjIEJ1ZyM1ODk5NiBTSE9XIENSRUFURSBUUklHR0VSIGZh
aWxzIHdoZW4gc3ViamVjdCB0YWJsZSBpcyBzaGFkb3dlZCBieQorIyAgICAgICAgICAgYSB0ZW1w
b3JhcnkgdGFibGUuCisjCitEUk9QIFRBQkxFIElGIEVYSVNUUyB0MTsKK0NSRUFURSBUQUJMRSB0
MSAoYSBJTlQpOworQ1JFQVRFIFRSSUdHRVIgdDFfYmkgQkVGT1JFIElOU0VSVCBPTiB0MSBGT1Ig
RUFDSCBST1cgQkVHSU4gRU5EOworU0hPVyBDUkVBVEUgVFJJR0dFUiB0MV9iaTsKK1RyaWdnZXIJ
c3FsX21vZGUJU1FMIE9yaWdpbmFsIFN0YXRlbWVudAljaGFyYWN0ZXJfc2V0X2NsaWVudAljb2xs
YXRpb25fY29ubmVjdGlvbglEYXRhYmFzZSBDb2xsYXRpb24KK3QxX2JpCQlDUkVBVEUgREVGSU5F
Uj1gcm9vdGBAYGxvY2FsaG9zdGAgVFJJR0dFUiB0MV9iaSBCRUZPUkUgSU5TRVJUIE9OIHQxIEZP
UiBFQUNIIFJPVyBCRUdJTiBFTkQJbGF0aW4xCWxhdGluMV9zd2VkaXNoX2NpCWxhdGluMV9zd2Vk
aXNoX2NpCitDUkVBVEUgVEVNUE9SQVJZIFRBQkxFIHQxIChiIElOVCk7CitTSE9XIENSRUFURSBU
UklHR0VSIHQxX2JpOworVHJpZ2dlcglzcWxfbW9kZQlTUUwgT3JpZ2luYWwgU3RhdGVtZW50CWNo
YXJhY3Rlcl9zZXRfY2xpZW50CWNvbGxhdGlvbl9jb25uZWN0aW9uCURhdGFiYXNlIENvbGxhdGlv
bgordDFfYmkJCUNSRUFURSBERUZJTkVSPWByb290YEBgbG9jYWxob3N0YCBUUklHR0VSIHQxX2Jp
IEJFRk9SRSBJTlNFUlQgT04gdDEgRk9SIEVBQ0ggUk9XIEJFR0lOIEVORAlsYXRpbjEJbGF0aW4x
X3N3ZWRpc2hfY2kJbGF0aW4xX3N3ZWRpc2hfY2kKK0RST1AgVEVNUE9SQVJZIFRBQkxFIHQxOwor
RFJPUCBUQUJMRSB0MTsKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3Qvc2hvd19jaGVj
ay50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3Qvc2hvd19jaGVjay50ZXN0CTIwMTAtMTEtMTkgMDU6
NDc6NTAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L3Nob3dfY2hlY2sudGVzdAkyMDExLTAxLTA0
IDE0OjIzOjI1ICswMDAwCkBAIC0xMzI1LDkgKzEzMjUsNiBAQCBEUk9QIFRBQkxFIHQxOwogZGlz
Y29ubmVjdCBjb24xOwogCiAKLSMgV2FpdCB0aWxsIGFsbCBkaXNjb25uZWN0cyBhcmUgY29tcGxl
dGVkCi0tLXNvdXJjZSBpbmNsdWRlL3dhaXRfdW50aWxfY291bnRfc2Vzc2lvbnMuaW5jCi0KIC0t
ZWNobyAjCiAtLWVjaG8gIyBCdWcjNTczMDYgU0hPVyBQUk9DRVNTTElTVCBkb2VzIG5vdCBkaXNw
bGF5IHN0cmluZyBsaXRlcmFscyB3ZWxsLgogLS1lY2hvICMKQEAgLTEzNTUsMyArMTM1MiwyNyBA
QCBTRUxFQ1QgUkVMRUFTRV9MT0NLKCd0Jyk7CiAtLWNvbm5lY3Rpb24gZGVmYXVsdAogU0VUIE5B
TUVTIGxhdGluMTsKIAorCistLWVjaG8gIworLS1lY2hvICMgQnVnIzU4OTk2IFNIT1cgQ1JFQVRF
IFRSSUdHRVIgZmFpbHMgd2hlbiBzdWJqZWN0IHRhYmxlIGlzIHNoYWRvd2VkIGJ5CistLWVjaG8g
IyAgICAgICAgICAgYSB0ZW1wb3JhcnkgdGFibGUuCistLWVjaG8gIworCistLWRpc2FibGVfd2Fy
bmluZ3MKK0RST1AgVEFCTEUgSUYgRVhJU1RTIHQxOworLS1lbmFibGVfd2FybmluZ3MKKworQ1JF
QVRFIFRBQkxFIHQxIChhIElOVCk7CitDUkVBVEUgVFJJR0dFUiB0MV9iaSBCRUZPUkUgSU5TRVJU
IE9OIHQxIEZPUiBFQUNIIFJPVyBCRUdJTiBFTkQ7CitTSE9XIENSRUFURSBUUklHR0VSIHQxX2Jp
OworCitDUkVBVEUgVEVNUE9SQVJZIFRBQkxFIHQxIChiIElOVCk7CisjIFNob3VsZCBzdGlsbCB3
b3JrCitTSE9XIENSRUFURSBUUklHR0VSIHQxX2JpOworCitEUk9QIFRFTVBPUkFSWSBUQUJMRSB0
MTsKK0RST1AgVEFCTEUgdDE7CisKKworIyBXYWl0IHRpbGwgYWxsIGRpc2Nvbm5lY3RzIGFyZSBj
b21wbGV0ZWQKKy0tc291cmNlIGluY2x1ZGUvd2FpdF91bnRpbF9jb3VudF9zZXNzaW9ucy5pbmMK
Cj09PSBtb2RpZmllZCBmaWxlICdzcWwvc3FsX3Nob3cuY2MnCi0tLSBhL3NxbC9zcWxfc2hvdy5j
YwkyMDExLTAxLTAzIDE1OjQ1OjQzICswMDAwCisrKyBiL3NxbC9zcWxfc2hvdy5jYwkyMDExLTAx
LTA0IDE0OjIzOjI1ICswMDAwCkBAIC03ODA1LDcgKzc4MDUsNyBAQCBib29sIHNob3dfY3JlYXRl
X3RyaWdnZXIoVEhEICp0aGQsIGNvbnN0CiAgIC8qCiAgICAgT3BlbiB0aGUgdGFibGUgYnkgbmFt
ZSBpbiBvcmRlciB0byBsb2FkIFRhYmxlX3RyaWdnZXJzX2xpc3Qgb2JqZWN0LgogICAqLwotICBp
ZiAob3Blbl90YWJsZXModGhkLCAmbHN0LCAmbnVtX3RhYmxlcywKKyAgaWYgKG9wZW5fdGFibGVz
KHRoZCwgJmxzdCwgJm51bV90YWJsZXMsIE1ZU1FMX09QRU5fU0tJUF9URU1QT1JBUlkgfAogICAg
ICAgICAgICAgICAgICAgTVlTUUxfT1BFTl9GT1JDRV9TSEFSRURfSElHSF9QUklPX01ETCkpCiAg
IHsKICAgICBteV9lcnJvcihFUl9UUkdfQ0FOVF9PUEVOX1RBQkxFLCBNWUYoMCksCgo=

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-trunk-bug58996/
# testament_sha1: 8b8106cee20b08637e08af8a220992352af27407
# timestamp: 2011-01-04 15:23:35 +0100
# base_revision_id: marc.alff@stripped\
#   yab7b8mxeng998ia
# 
# Begin bundle
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


--===============6377679466130023755==--