From: Jon Olav Hauglid
Date: January 5 2011 2:43pm
Subject: bzr commit into mysql-trunk branch (jon.hauglid:3462) Bug#58996
List-Archive: http://lists.mysql.com/commits/127980
X-Bug: 58996
Message-Id: <201101051444.p05BWpUx032522@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6195452040282950667=="

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

I0F0IGZpbGU6Ly8vZXhwb3J0L2hvbWUveC9teXNxbC10cnVuay1idWc1ODk5Ni8gYmFzZWQgb24g
cmV2aWQ6Z2VvcmdpLmtvZGlub3ZAb3JhY2xlLmNvbS0yMDExMDEwNTEzMDY0Mi1wNDJiZTJibmY4
aDB6Z2FnCgogMzQ2MiBKb24gT2xhdiBIYXVnbGlkCTIwMTEtMDEtMDUKICAgICAgQnVnICM1ODk5
NiBTSE9XIENSRUFURSBUUklHR0VSIGZhaWxzIHdoZW4gc3ViamVjdCB0YWJsZSBpcyBzaGFkb3dl
ZCBieQogICAgICAgICAgICAgICAgIGEgdGVtcG9yYXJ5IHRhYmxlLgogICAgICAKICAgICAgVGhl
IHByb2JsZW0gd2FzIHRoYXQgU0hPVyBDUkVBVEUgVFJJR0dFUiBmYWlsZWQgdG8gc2hvdyBhIHRh
YmxlIHRyaWdnZXIKICAgICAgaWYgYSB0ZW1wb3JhcnkgdGFibGUgd2l0aCB0aGUgc2FtZSBuYW1l
IGFzIHRoZSB0cmlnZ2VyIHRhYmxlIGV4aXN0ZWQuCiAgICAgIFRoaXMgZXZlbiBpZiB0ZW1wb3Jh
cnkgdGFibGVzIGNhbm5vdCBoYXZlIHRyaWdnZXJzIGFuZCBTSE9XIENSRUFURQogICAgICBUUklH
R0VSIHNwZWNpZmllcyB0aGUgbmFtZSBvZiB0aGUgdHJpZ2dlciAobm90IHRoZSBuYW1lIG9mIHRo
ZSB0YWJsZSkuCiAgICAgIAogICAgICBUaGlzIHBhdGNoIGZpeGVzIHRoZSBwcm9ibGVtIGJ5IGZv
cmNpbmcgU0hPVyBDUkVBVEUgVFJJR0dFUiB0byBpZ25vcmUKICAgICAgdGVtcG9yYXJ5IHRhYmxl
cyB3aGVuIHRyeWluZyB0byBvcGVuIHRoZSB0YWJsZSBmb3Igd2hpY2ggdGhlIHRyaWdnZXIKICAg
ICAgaXMgZGVmaW5lZC4KICAgICAgCiAgICAgIFRlc3QgY2FzZSBhZGRlZCB0byBzaG93X2NoZWNr
LnRlc3QuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9zaG93X2NoZWNrLnJlc3Vs
dAogICAgICBteXNxbC10ZXN0L3Qvc2hvd19jaGVjay50ZXN0CiAgICAgIHNxbC9zcWxfc2hvdy5j
Ywo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL3Nob3dfY2hlY2sucmVzdWx0JwotLS0g
YS9teXNxbC10ZXN0L3Ivc2hvd19jaGVjay5yZXN1bHQJMjAxMC0xMS0zMCAxNzo1NTozNiArMDAw
MAorKysgYi9teXNxbC10ZXN0L3Ivc2hvd19jaGVjay5yZXN1bHQJMjAxMS0wMS0wNSAxNDo0Mzoy
OCArMDAwMApAQCAtMTU0MCwzICsxNTQwLDE5IEBAIFJFTEVBU0VfTE9DSygndCcpCiDDs8Ozw7PD
swogMQogU0VUIE5BTUVTIGxhdGluMTsKKyMKKyMgQnVnIzU4OTk2IFNIT1cgQ1JFQVRFIFRSSUdH
RVIgZmFpbHMgd2hlbiBzdWJqZWN0IHRhYmxlIGlzIHNoYWRvd2VkIGJ5CisjICAgICAgICAgICBh
IHRlbXBvcmFyeSB0YWJsZS4KKyMKK0RST1AgVEFCTEUgSUYgRVhJU1RTIHQxOworQ1JFQVRFIFRB
QkxFIHQxIChhIElOVCk7CitDUkVBVEUgVFJJR0dFUiB0MV9iaSBCRUZPUkUgSU5TRVJUIE9OIHQx
IEZPUiBFQUNIIFJPVyBCRUdJTiBFTkQ7CitTSE9XIENSRUFURSBUUklHR0VSIHQxX2JpOworVHJp
Z2dlcglzcWxfbW9kZQlTUUwgT3JpZ2luYWwgU3RhdGVtZW50CWNoYXJhY3Rlcl9zZXRfY2xpZW50
CWNvbGxhdGlvbl9jb25uZWN0aW9uCURhdGFiYXNlIENvbGxhdGlvbgordDFfYmkJCUNSRUFURSBE
RUZJTkVSPWByb290YEBgbG9jYWxob3N0YCBUUklHR0VSIHQxX2JpIEJFRk9SRSBJTlNFUlQgT04g
dDEgRk9SIEVBQ0ggUk9XIEJFR0lOIEVORAlsYXRpbjEJbGF0aW4xX3N3ZWRpc2hfY2kJbGF0aW4x
X3N3ZWRpc2hfY2kKK0NSRUFURSBURU1QT1JBUlkgVEFCTEUgdDEgKGIgSU5UKTsKK1NIT1cgQ1JF
QVRFIFRSSUdHRVIgdDFfYmk7CitUcmlnZ2VyCXNxbF9tb2RlCVNRTCBPcmlnaW5hbCBTdGF0ZW1l
bnQJY2hhcmFjdGVyX3NldF9jbGllbnQJY29sbGF0aW9uX2Nvbm5lY3Rpb24JRGF0YWJhc2UgQ29s
bGF0aW9uCit0MV9iaQkJQ1JFQVRFIERFRklORVI9YHJvb3RgQGBsb2NhbGhvc3RgIFRSSUdHRVIg
dDFfYmkgQkVGT1JFIElOU0VSVCBPTiB0MSBGT1IgRUFDSCBST1cgQkVHSU4gRU5ECWxhdGluMQls
YXRpbjFfc3dlZGlzaF9jaQlsYXRpbjFfc3dlZGlzaF9jaQorRFJPUCBURU1QT1JBUlkgVEFCTEUg
dDE7CitEUk9QIFRBQkxFIHQxOwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3QvdC9zaG93
X2NoZWNrLnRlc3QnCi0tLSBhL215c3FsLXRlc3QvdC9zaG93X2NoZWNrLnRlc3QJMjAxMC0xMS0x
OSAwNTo0Nzo1MCArMDAwMAorKysgYi9teXNxbC10ZXN0L3Qvc2hvd19jaGVjay50ZXN0CTIwMTEt
MDEtMDUgMTQ6NDM6MjggKzAwMDAKQEAgLTEzMjUsOSArMTMyNSw2IEBAIERST1AgVEFCTEUgdDE7
CiBkaXNjb25uZWN0IGNvbjE7CiAKIAotIyBXYWl0IHRpbGwgYWxsIGRpc2Nvbm5lY3RzIGFyZSBj
b21wbGV0ZWQKLS0tc291cmNlIGluY2x1ZGUvd2FpdF91bnRpbF9jb3VudF9zZXNzaW9ucy5pbmMK
LQogLS1lY2hvICMKIC0tZWNobyAjIEJ1ZyM1NzMwNiBTSE9XIFBST0NFU1NMSVNUIGRvZXMgbm90
IGRpc3BsYXkgc3RyaW5nIGxpdGVyYWxzIHdlbGwuCiAtLWVjaG8gIwpAQCAtMTM1NSwzICsxMzUy
LDI3IEBAIFNFTEVDVCBSRUxFQVNFX0xPQ0soJ3QnKTsKIC0tY29ubmVjdGlvbiBkZWZhdWx0CiBT
RVQgTkFNRVMgbGF0aW4xOwogCisKKy0tZWNobyAjCistLWVjaG8gIyBCdWcjNTg5OTYgU0hPVyBD
UkVBVEUgVFJJR0dFUiBmYWlscyB3aGVuIHN1YmplY3QgdGFibGUgaXMgc2hhZG93ZWQgYnkKKy0t
ZWNobyAjICAgICAgICAgICBhIHRlbXBvcmFyeSB0YWJsZS4KKy0tZWNobyAjCisKKy0tZGlzYWJs
ZV93YXJuaW5ncworRFJPUCBUQUJMRSBJRiBFWElTVFMgdDE7CistLWVuYWJsZV93YXJuaW5ncwor
CitDUkVBVEUgVEFCTEUgdDEgKGEgSU5UKTsKK0NSRUFURSBUUklHR0VSIHQxX2JpIEJFRk9SRSBJ
TlNFUlQgT04gdDEgRk9SIEVBQ0ggUk9XIEJFR0lOIEVORDsKK1NIT1cgQ1JFQVRFIFRSSUdHRVIg
dDFfYmk7CisKK0NSRUFURSBURU1QT1JBUlkgVEFCTEUgdDEgKGIgSU5UKTsKKyMgU2hvdWxkIHN0
aWxsIHdvcmsKK1NIT1cgQ1JFQVRFIFRSSUdHRVIgdDFfYmk7CisKK0RST1AgVEVNUE9SQVJZIFRB
QkxFIHQxOworRFJPUCBUQUJMRSB0MTsKKworCisjIFdhaXQgdGlsbCBhbGwgZGlzY29ubmVjdHMg
YXJlIGNvbXBsZXRlZAorLS1zb3VyY2UgaW5jbHVkZS93YWl0X3VudGlsX2NvdW50X3Nlc3Npb25z
LmluYwoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9zcWxfc2hvdy5jYycKLS0tIGEvc3FsL3NxbF9z
aG93LmNjCTIwMTEtMDEtMDMgMTU6NDU6NDMgKzAwMDAKKysrIGIvc3FsL3NxbF9zaG93LmNjCTIw
MTEtMDEtMDUgMTQ6NDM6MjggKzAwMDAKQEAgLTEsNCArMSw0IEBACi0vKiBDb3B5cmlnaHQgKGMp
IDIwMDAsIDIwMTAsIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCByaWdodHMgcmVz
ZXJ2ZWQuCisvKiBDb3B5cmlnaHQgKGMpIDIwMDAsIDIwMTEsIE9yYWNsZSBhbmQvb3IgaXRzIGFm
ZmlsaWF0ZXMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAKICAgIFRoaXMgcHJvZ3JhbSBpcyBmcmVl
IHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5CiAgICBpdCB1
bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxp
c2hlZCBieQpAQCAtNzgwNSw3ICs3ODA1LDcgQEAgYm9vbCBzaG93X2NyZWF0ZV90cmlnZ2VyKFRI
RCAqdGhkLCBjb25zdAogICAvKgogICAgIE9wZW4gdGhlIHRhYmxlIGJ5IG5hbWUgaW4gb3JkZXIg
dG8gbG9hZCBUYWJsZV90cmlnZ2Vyc19saXN0IG9iamVjdC4KICAgKi8KLSAgaWYgKG9wZW5fdGFi
bGVzKHRoZCwgJmxzdCwgJm51bV90YWJsZXMsCisgIGlmIChvcGVuX3RhYmxlcyh0aGQsICZsc3Qs
ICZudW1fdGFibGVzLCBNWVNRTF9PUEVOX1NLSVBfVEVNUE9SQVJZIHwKICAgICAgICAgICAgICAg
ICAgIE1ZU1FMX09QRU5fRk9SQ0VfU0hBUkVEX0hJR0hfUFJJT19NREwpKQogICB7CiAgICAgbXlf
ZXJyb3IoRVJfVFJHX0NBTlRfT1BFTl9UQUJMRSwgTVlGKDApLAoK

--===============6195452040282950667==
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: 8c3a52c85f6198b71326907e8b25f19b99968f3b
# timestamp: 2011-01-05 15:43:33 +0100
# base_revision_id: georgi.kodinov@stripped\
#   p42be2bnf8h0zgag
# 
# Begin bundle
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
asg=


--===============6195452040282950667==--