From: marko.makela
Date: May 31 2011 8:27am
Subject: bzr push into mysql-5.5 branch (marko.makela:3413 to 3414) Bug#12606344
List-Archive: http://lists.mysql.com/commits/138366
X-Bug: 12606344
Message-Id: <201105310828.p4V8S5Qd017964@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0701776148=="

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

IDM0MTQgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0zMQogICAgICBCdWcjMTI2MDYzNDQgLSBBREQg
VkFMR1JJTkQgRElBR05PU1RJQ1MgVE8gTVRSX1NUQVJULCBNVFJfQ09NTUlUCiAgICAgIAogICAg
ICBtdHJfc3RhcnQoKTogRGVjbGFyZSB0aGUgbXRyIG1lbW9yeSBhcmVhIHVuaW5pdGlhbGl6ZWQg
aW4gVmFsZ3JpbmQKICAgICAgYmVmb3JlIGluaXRpYWxpemluZyB0aGUgZmllbGRzLgogICAgICAK
ICAgICAgbXRyX2NvbW1pdCgpOiBEZWNsYXJlIGV2ZXJ5dGhpbmcgdW5pbml0aWFsaXplZCBleGNl
cHQKICAgICAgbXRyLT5zdGFydF9sc24sIG10ci0+ZW5kX2xzbiBhbmQgbXRyLT5zdGF0ZS4KCiAg
ICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL210cjBtdHIuaWMKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9tdHIvbXRyMG10ci5jCiAzNDEzIERhdmkgQXJuYXV0CTIwMTEt
MDUtMzAKICAgICAgQnVnIzExNzY2MzQ5IC0gNTk0NDM6IHF1ZXJ5X2NhY2hlX2RlYnVnLnRlc3Qg
aXMgb2NjYXNpb25hbGx5IHZlcnkgc2xvdwogICAgICAKICAgICAgVGhlIHRlc3QgY2FzZSBwcm9i
bGVtIHN0ZW1tZWQgZnJvbSB0aGUgZmFjdCB0aGF0IGEgZGVidWcgc3luYwogICAgICBzaWduYWwg
aXMgYSBnbG9iYWwgdmFyaWFibGUgdGhhdCBwZXJzaXN0cyB1bnRpbCBvdmVyd3JpdHRlbgogICAg
ICBieSBhIG5ldyBzaWduYWwuIFRoaXMgbWVhbnMgdGhhdCBpZiB0d28gZGlmZmVyZW50IHNpZ25h
bHMKICAgICAgYXJlIHJhaXNlZCBpbiBzZXF1ZW5jZSwgYSB0aHJlYWQgd2FpdGluZyBmb3IgdGhl
IGZpcnN0IHNpZ25hbAogICAgICBtaWdodCBtaXNzIGl0IGlmIHRoZSBzZWNvbmQgc2lnbmFsIHNl
dHMgdGhlIGdsb2JhbCB2YXJpYWJsZQogICAgICBiZWZvcmUgdGhlIHRocmVhZCB3YWtlcyB1cC4K
ICAgICAgCiAgICAgIFRoZSBzb2x1dGlvbiBpcyB0byBkZWxpdmVyIGEgc3Vic2VxdWVudCBzaWdu
YWwgb25seSBhZnRlciB0aGUKICAgICAgd2FpdGluZyB0aHJlYWQgaGFzIHJlY2VpdmVkIGl0Lgog
ICAgIEAgbXlzcWwtdGVzdC90L3F1ZXJ5X2NhY2hlX2RlYnVnLnRlc3QKICAgICAgICBXYWl0IGZv
ciBzaWduYWwgdG8gYmUgZGVsaXZlcmVkLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0
L3IvcXVlcnlfY2FjaGVfZGVidWcucmVzdWx0CiAgICAgIG15c3FsLXRlc3QvdC9xdWVyeV9jYWNo
ZV9kZWJ1Zy50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
bXRyMG10ci5pYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL210cjBtdHIuaWMJcmV2
aWQ6ZGF2aS5hcm5hdXRAb3JhY2xlLmNvbS0yMDExMDUzMDE1MTcyMi1waTQ2eTQwbm0yN25ybXY1
CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9tdHIwbXRyLmljCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTEwNTMxMDc1NTI5LTNydG1vMWY1NzQzNXlwcHAKQEAgLTM3LDYg
KzM3LDggQEAgbXRyX3N0YXJ0KAogLyo9PT09PT0qLwogCW10cl90KgltdHIpCS8qITwgb3V0OiBt
aW5pLXRyYW5zYWN0aW9uICovCiB7CisJVU5JVl9NRU1fSU5WQUxJRChtdHIsIHNpemVvZiAqbXRy
KTsKKwogCWR5bl9hcnJheV9jcmVhdGUoJihtdHItPm1lbW8pKTsKIAlkeW5fYXJyYXlfY3JlYXRl
KCYobXRyLT5sb2cpKTsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvbXRy
L210cjBtdHIuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9tdHIvbXRyMG10ci5jCXJldmlkOmRh
dmkuYXJuYXV0QG9yYWNsZS5jb20tMjAxMTA1MzAxNTE3MjItcGk0Nnk0MG5tMjducm12NQorKysg
Yi9zdG9yYWdlL2lubm9iYXNlL210ci9tdHIwbXRyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTA1MzEwNzU1MjktM3J0bW8xZjU3NDM1eXBwcApAQCAtMjY1LDkgKzI2NSwyMCBA
QCBtdHJfY29tbWl0KAogCW10cl9tZW1vX3BvcF9hbGwobXRyKTsKICNlbmRpZiAvKiAhVU5JVl9I
T1RCQUNLVVAgKi8KIAotCXV0X2QobXRyLT5zdGF0ZSA9IE1UUl9DT01NSVRURUQpOwogCWR5bl9h
cnJheV9mcmVlKCYobXRyLT5tZW1vKSk7CiAJZHluX2FycmF5X2ZyZWUoJihtdHItPmxvZykpOwor
I2lmZGVmIFVOSVZfREVCVUdfVkFMR1JJTkQKKwkvKiBEZWNsYXJlIGV2ZXJ5dGhpbmcgdW5pbml0
aWFsaXplZCBleGNlcHQKKwltdHItPnN0YXJ0X2xzbiwgbXRyLT5lbmRfbHNuIGFuZCBtdHItPnN0
YXRlLiAqLworCXsKKwkJaWJfdWludDY0X3QJc3RhcnRfbHNuCT0gbXRyLT5zdGFydF9sc247CisJ
CWliX3VpbnQ2NF90CWVuZF9sc24JCT0gbXRyLT5lbmRfbHNuOworCQlVTklWX01FTV9JTlZBTElE
KG10ciwgc2l6ZW9mICptdHIpOworCQltdHItPnN0YXJ0X2xzbiA9IHN0YXJ0X2xzbjsKKwkJbXRy
LT5lbmRfbHNuID0gZW5kX2xzbjsKKwl9CisjZW5kaWYgLyogVU5JVl9ERUJVR19WQUxHUklORCAq
LworCXV0X2QobXRyLT5zdGF0ZSA9IE1UUl9DT01NSVRURUQpOwogfQogCiAjaWZuZGVmIFVOSVZf
SE9UQkFDS1VQCgo=

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@stripped
# target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# testament_sha1: 8996be3ea031a49c132f64a576d6f6305f379d8f
# timestamp: 2011-05-31 11:27:57 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: davi.arnaut@stripped\
#   pi46y40nm27nrmv5
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWalKs8YAAo1flAAwWnf//3+n
nwC/7//6BAAIAFAFbXlOjQ7budy60hVMEkimaU8gZR4TII9Rp6KaDI2oDJoNBkCSo0aamxT1JtRt
QeoAAAGjQAA0ASmokyMo/UhtTymj1D1PSNNB6QANNAAAcZMmTEYmAEyYJkANGEYAhgEkgRo0Cam0
CGmkJ6nqPSeoepkBp5R6nqekH0cJzmd93A5zK0/rHPyRUGI0W7H8Tj68DwI5bOzyfpWoww7YM5ME
QKOyxz8CLJdWGYxKonMQkhJqvBtCKV8zsz53xVMiJ8b3t590p0z7cDDfw5fhVCSVeUmM1jL7Ynj/
FriRA3kWRAg4PKTHjzbecJyh9BblageyLOowFMmdJ3Zlt/eVEPrJB26ER+Iuk80hgP4F5uFJIxik
y/nor3rV+qcU3TuWRRITLnQXntp2DE+SQeBvYO7L3v1+nMhe0UpJiuscbhkisTPi4DMb3oZV63sW
Gke4TtBSWCKOdL6e7iPQn3gb+k9rtVyF2kIsE0eY2Uvqz4u7TEUhPXdBuYQT3YH9gm2xVRYc+KEo
FDRwnMZ79nIB9VJOv3rehWnOpSxK9ZDdEPcud05VIJizmjb2MM34iJUWmTF2V0lYwESL9cnDD3FQ
GgtRTfqNwp5lZxNmwD5wuWjW9apYdUTcA85K9hS+vUtdMscSdInlAuMsLI5eKBCsiQ+SUC2GZIlg
sQKmUaASFpltLLYFJoPms3VgQjUYOsnwdwj2kTZmzFhEwFC583Goo4zeFZMTi/QqUCJOj1iJwFoG
1ZbSsU8IkisvvC6haxcrUzrhT2Cg+sk59dhfElO15VWYkYLbPJm4FYGYmzoTeNNgv61+1TlG5P1E
0KWShU57UTp2nSh7RxxApFG11iSNqhYKZmPYrlvGnz5LAZ0g9xq6DbsSM4rCVXIKeX9o76ZDDMN4
rs9Sr0Xg4j5RLQiTs9DERV6L1KmsMqrHEQchgw8iCiSnkohlnI/RChQoVEH1R841NBrlo8rLw7RL
gOvFBdEOgcmEpSrTFb0kISF353hHkMpJkNqQMaJXDcpaZbd7GwO/Zs2kDQ5zjejqQWdqKyuK4zZk
7GldKg4KRJwyaolTLm4C1GW3Xw+9ZnPj0C8Dv7q6s4AM4a8Wy44nEVYnCzE3+f6aWzbinAnqgLsw
fEGKQw6ny69WwhSBMNCYTD9BGhwvf3GNdouNV08mUVxYWmO5X5vjzdBhEOc2xUUAppiHriwDd7C2
42O6k3C69GYniRRflkV4fNaS2pZ2afWaLLJ42i/bi4wQXNZ1xh1eFa0pgpKih2ndRAy3FpYhipD+
JHLqoAxmOOwfvA5SIm8UK4nJOUuTyMBxpmcdI9bdQttpoFUQYlRYpnmhb53q1tZen58PQhoQt5WW
wxCxFR5qXnRRfuMqhaeOmyTQjQjPMGecEwxwgJuk5dKD13o5hHb/XIKIo5JWprRwJgsFhnaCqkqu
tIwTcUHieSY16alebYYjGhYdAF1UVV0L0OB7IJjRz2OApGTDRMFPaYsMwYDAymRV0QYZF6UXB7Ny
cDCuX1KUBkMwMr7xFIEk0Y60Sgi+LBrDrBMiYN0z1nek+jmYYIPUHXJyDV5gZVZEdduthJQVg4ZA
d8BzIIV5VC/sjEQV6cpYsb0obQIRiYHm9+V+QKJTchi8qCv3As5kuXeFbK0UDExpv1L7IbQeQF4B
mkRTtVwZMZEeagTwGAgWItW9ADRFFwNzXrHhLr6cJ8FnRXxFWlKmRdo8zEqw6F0gVsHV2IKoH8WZ
P8XckU4UJCpSrPGA


--===============0701776148==--