From: kevin.lewis
Date: January 21 2011 4:14pm
Subject: bzr commit into mysql-trunk-innodb branch (kevin.lewis:3449) Bug#58629
List-Archive: http://lists.mysql.com/commits/129358
X-Bug: 58629
Message-Id: <20110121161453.800159AEBE4@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2109644907=="

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

I0F0IGZpbGU6Ly8vVXNlcnMva2V2aW5sZXdpcy9Xb3JrL015c3FsLzU4NjI5L215c3FsLXRydW5r
LWlubm9kYi8gYmFzZWQgb24gcmV2aWQ6a2V2aW4ubGV3aXNAb3JhY2xlLmNvbS0yMDExMDEyMTA0
MjIyNi1xdjgwdGZoNDB1eGM3eDFmCgogMzQ0OSBrZXZpbi5sZXdpc0BvcmFjbGUuY29tCTIwMTEt
MDEtMjEKICAgICAgQnVnIzU4NjI5IC0gRGlzYWJsZSBVTklWX01VU1RfTk9UX0lOTElORQogICAg
ICBJbm5vREIgZGlzYWJsZXMgaW5saW5pbmcgb2YgY29kZSBmb3IgYWxsIHBsYXRmb3JtcyB0aGF0
IGFyZSBub3QgTGludXggYW5kIFN1bjsKICAgICAgCiAgICAgICMgaWYgIWRlZmluZWQoX19HTlVD
X18pICYmICEoZGVmaW5lZChfX1NVTlBST19DKSB8fCBkZWZpbmVkKF9fU1VOUFJPX0NDKSkKICAg
ICAgIyAgdW5kZWYgIFVOSVZfTVVTVF9OT1RfSU5MSU5FCiAgICAgICMgIGRlZmluZSBVTklWX01V
U1RfTk9UX0lOTElORQogICAgICAjIGVuZGlmCiAgICAgIAogICAgICBUaGlzIHBhdGNoIGFuZCBi
dWcgZml4IGVuYWJsZXMgaW5saW5pbmcgb2YgY29kZSBvbiBhbGwgb3RoZXIgcGxhdGZvcm1zLgog
ICAgICBJdCByZW1vdmVzIGFsbCByZWZlcmVuY2VzIHRvIFVOSVZfTVVTVF9OT1RfSU5MSU5FIGlu
IHRoZSBidWlsZCBmaWxlcywKICAgICAgYnV0IGtlZXBzIHRoZSAjaWZkZWYgVU5JVl9NVVNUX05P
VF9JTkxJTkUgaW4gdW5pdi5pIGFuZCB0aGUgVU5JVl9OT05JTkwKICAgICAgaW4gdmFyaW91cyBm
aWxlcy4gVGhpcyBpcyBiZWNhdXNlIHdlIG1heSB3YW50IHRvIGRpc2FibGUgdGhlIGlubGluaW5n
IG9mIC5pYyBmaWxlcwogICAgICB0byB0cm91Ymxlc2hvb3Qgc29tZSBmdXR1cmUgcHJvYmxlbS4K
ICAgICAgCiAgICAgIFJCOi8vNTM4ICBBcHByb3ZlZCBieSBNYXJrbyBNw6RrZWzDpAoKICAgIG1v
ZGlmaWVkOgogICAgICBCVUlMRC9TRVRVUC5zaAogICAgICBCVUlMRC9idWlsZF9tY2NnZS5zaAog
ICAgICBzY3JpcHRzL215c3FsX2NvbmZpZy5wbC5pbgogICAgICBzY3JpcHRzL215c3FsX2NvbmZp
Zy5zaAogICAgICBzdG9yYWdlL2lubm9iYXNlL0NNYWtlTGlzdHMudHh0CiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS91bml2LmkKPT09IG1vZGlmaWVkIGZpbGUgJ0JVSUxEL1NFVFVQLnNo
JwotLS0gYS9CVUlMRC9TRVRVUC5zaAlyZXZpZDprZXZpbi5sZXdpc0BvcmFjbGUuY29tLTIwMTEw
MTIxMDQyMjI2LXF2ODB0Zmg0MHV4Yzd4MWYKKysrIGIvQlVJTEQvU0VUVVAuc2gJcmV2aWQ6a2V2
aW4ubGV3aXNAb3JhY2xlLmNvbS0yMDExMDEyMTE2MTQ0Ny1nYm84bGl2YXY0N2N5dnZ0CkBAIC0x
NDIsNyArMTQyLDcgQEAgdmFsZ3JpbmRfZmxhZ3M9IiR2YWxncmluZF9mbGFncyAtRE1ZU1FMXwog
dmFsZ3JpbmRfY29uZmlncz0iLS13aXRoLXZhbGdyaW5kIgogIwogIyBVc2VkIGluIC1kZWJ1ZyBi
dWlsZHMKLWRlYnVnX2NmbGFncz0iLURVTklWX01VU1RfTk9UX0lOTElORSAtREVYVFJBX0RFQlVH
IC1ERk9SQ0VfSU5JVF9PRl9WQVJTICIKK2RlYnVnX2NmbGFncz0iLURFWFRSQV9ERUJVRyAtREZP
UkNFX0lOSVRfT0ZfVkFSUyAiCiBkZWJ1Z19jZmxhZ3M9IiRkZWJ1Z19jZmxhZ3MgLURTQUZFX01V
VEVYIgogZXJyb3JfaW5qZWN0PSItLXdpdGgtZXJyb3ItaW5qZWN0ICIKICMKCj09PSBtb2RpZmll
ZCBmaWxlICdCVUlMRC9idWlsZF9tY2NnZS5zaCcKLS0tIGEvQlVJTEQvYnVpbGRfbWNjZ2Uuc2gJ
cmV2aWQ6a2V2aW4ubGV3aXNAb3JhY2xlLmNvbS0yMDExMDEyMTA0MjIyNi1xdjgwdGZoNDB1eGM3
eDFmCisrKyBiL0JVSUxEL2J1aWxkX21jY2dlLnNoCXJldmlkOmtldmluLmxld2lzQG9yYWNsZS5j
b20tMjAxMTAxMjExNjE0NDctZ2JvOGxpdmF2NDdjeXZ2dApAQCAtMTE3OCw3ICsxMTc4LDcgQEAg
c2V0X3dpdGhfZGVidWdfZmxhZ3MoKQogewogICBpZiB0ZXN0ICJ4JHdpdGhfZGVidWdfZmxhZyIg
PSAieHllcyIgOyB0aGVuCiAgICAgaWYgdGVzdCAieCRkZXZlbG9wZXJfZmxhZyIgPSAieHllcyIg
OyB0aGVuCi0gICAgICBsb2NfZGVidWdfZmxhZ3M9Ii1EVU5JVl9NVVNUX05PVF9JTkxJTkUgLURF
WFRSQV9ERUJVRyAtREZPUkNFX0lOSVRfT0ZfVkFSUyAiCisgICAgICBsb2NfZGVidWdfZmxhZ3M9
Ii1ERVhUUkFfREVCVUcgLURGT1JDRV9JTklUX09GX1ZBUlMgIgogICAgICAgY29tcGlsZXJfZmxh
Z3M9IiRjb21waWxlcl9mbGFncyAkbG9jX2RlYnVnX2ZsYWdzIgogICAgIGZpCiAgICAgY29tcGls
ZXJfZmxhZ3M9IiRjb21waWxlcl9mbGFncyAkZXh0cmFfZGVidWdfZmxhZ3MiCgo9PT0gbW9kaWZp
ZWQgZmlsZSAnc2NyaXB0cy9teXNxbF9jb25maWcucGwuaW4nCi0tLSBhL3NjcmlwdHMvbXlzcWxf
Y29uZmlnLnBsLmluCXJldmlkOmtldmluLmxld2lzQG9yYWNsZS5jb20tMjAxMTAxMjEwNDIyMjYt
cXY4MHRmaDQwdXhjN3gxZgorKysgYi9zY3JpcHRzL215c3FsX2NvbmZpZy5wbC5pbglyZXZpZDpr
ZXZpbi5sZXdpc0BvcmFjbGUuY29tLTIwMTEwMTIxMTYxNDQ3LWdibzhsaXZhdjQ3Y3l2dnQKQEAg
LTQyLDcgKzQyLDcgQEAgdXNlIEN3ZDsKIHVzZSBzdHJpY3Q7CiAKIG15IEBleGNsdWRlX2NmbGFn
cyA9Ci0gIHF3L0REQlVHX09GRiBEU0FGRV9NVVRFWCBEVU5JVl9NVVNUX05PVF9JTkxJTkUgREZP
UkNFX0lOSVRfT0ZfVkFSUworICBxdy9EREJVR19PRkYgRFNBRkVfTVVURVggREZPUkNFX0lOSVRf
T0ZfVkFSUwogICAgICBERVhUUkFfREVCVUcgREhBVkVfcHVyaWZ5IE8gT1swLTldIHhPWzAtOV0g
V1stQS1aYS16XSoKICAgICAgWGEgeHN0cmNvbnN0IHhjOTk9bm9uZQogICAgICB1bnJvbGwyIGlw
IG1wIHJlc3RyaWN0LzsKCj09PSBtb2RpZmllZCBmaWxlICdzY3JpcHRzL215c3FsX2NvbmZpZy5z
aCcKLS0tIGEvc2NyaXB0cy9teXNxbF9jb25maWcuc2gJcmV2aWQ6a2V2aW4ubGV3aXNAb3JhY2xl
LmNvbS0yMDExMDEyMTA0MjIyNi1xdjgwdGZoNDB1eGM3eDFmCisrKyBiL3NjcmlwdHMvbXlzcWxf
Y29uZmlnLnNoCXJldmlkOmtldmluLmxld2lzQG9yYWNsZS5jb20tMjAxMTAxMjExNjE0NDctZ2Jv
OGxpdmF2NDdjeXZ2dApAQCAtMTMzLDcgKzEzMyw3IEBAIGluY2x1ZGU9Ii1JJHBrZ2luY2x1ZGVk
aXIiCiAjICAgICAgIGFuZCAteHN0cmNvbnN0IHRvIG1ha2UgLS1jZmxhZ3MgdXNhYmxlIGZvciBT
dW4gRm9ydGUgQysrCiAjIEZJWE1FIHVudGlsIHdlIGhhdmUgYSAtLWN4eGZsYWdzLCB3ZSBuZWVk
IHRvIHJlbW92ZSAtQUM5OQogIyAgICAgICB0byBtYWtlIC0tY2ZsYWdzIHVzYWJsZSBmb3IgSFAg
QysrIChhQ0MpCi1mb3IgcmVtb3ZlIGluIEREQlVHX09GRiBEU0FGRV9NVVRFWCBEVU5JVl9NVVNU
X05PVF9JTkxJTkUgREZPUkNFX0lOSVRfT0ZfVkFSUyBcCitmb3IgcmVtb3ZlIGluIEREQlVHX09G
RiBEU0FGRV9NVVRFWCBERk9SQ0VfSU5JVF9PRl9WQVJTIFwKICAgICAgICAgICAgICAgREVYVFJB
X0RFQlVHIERIQVZFX3B1cmlmeSBPICdPWzAtOV0nICd4T1swLTldJyAnV1stQS1aYS16XSonIFwK
ICAgICAgICAgICAgICAgJ210dW5lPVstQS1aYS16MC05XSonICdtY3B1PVstQS1aYS16MC05XSon
ICdtYXJjaD1bLUEtWmEtejAtOV0qJyBcCiAgICAgICAgICAgICAgIFhhIHhzdHJjb25zdCAieGM5
OT1ub25lIiBBQzk5IFwKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL0NNYWtl
TGlzdHMudHh0JwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL0NNYWtlTGlzdHMudHh0CXJldmlkOmtl
dmluLmxld2lzQG9yYWNsZS5jb20tMjAxMTAxMjEwNDIyMjYtcXY4MHRmaDQwdXhjN3gxZgorKysg
Yi9zdG9yYWdlL2lubm9iYXNlL0NNYWtlTGlzdHMudHh0CXJldmlkOmtldmluLmxld2lzQG9yYWNs
ZS5jb20tMjAxMTAxMjExNjE0NDctZ2JvOGxpdmF2NDdjeXZ2dApAQCAtMzAsMTMgKzMwLDExIEBA
IElGKFVOSVgpCiAgICAgICBMSU5LX0xJQlJBUklFUyhhaW8pCiAgICAgRU5ESUYoKQogICBFTFNF
SUYoQ01BS0VfU1lTVEVNX05BTUUgTUFUQ0hFUyAiSFAqIikKLSAgICBBRERfREVGSU5JVElPTlMo
Ii1EVU5JVl9IUFVYIC1EVU5JVl9NVVNUX05PVF9JTkxJTkUiKQorICAgIEFERF9ERUZJTklUSU9O
UygiLURVTklWX0hQVVgiKQogICBFTFNFSUYoQ01BS0VfU1lTVEVNX05BTUUgU1RSRVFVQUwgIkFJ
WCIpCi0gICAgQUREX0RFRklOSVRJT05TKCItRFVOSVZfQUlYIC1EVU5JWF9NVVNUX05PVF9JTkxJ
TkUiKQorICAgIEFERF9ERUZJTklUSU9OUygiLURVTklWX0FJWCIpCiAgIEVMU0VJRihDTUFLRV9T
WVNURU1fTkFNRSBTVFJFUVVBTCAiU3VuT1MiKQogICAgIEFERF9ERUZJTklUSU9OUygiLURVTklW
X1NPTEFSSVMiKQotICBFTFNFKCkKLSAgIEFERF9ERUZJTklUSU9OUygiLURVTklWX01VU1RfTk9U
X0lOTElORSIpCiAgIEVORElGKCkKIEVORElGKCkKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmknCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS91bml2LmkJcmV2aWQ6a2V2aW4ubGV3aXNAb3JhY2xlLmNvbS0yMDExMDEyMTA0MjIyNi1xdjgw
dGZoNDB1eGM3eDFmCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkJcmV2aWQ6
a2V2aW4ubGV3aXNAb3JhY2xlLmNvbS0yMDExMDEyMTE2MTQ0Ny1nYm84bGl2YXY0N2N5dnZ0CkBA
IC0xMjMsMTEgKzEyMyw2IEBAIGlmIHdlIGFyZSBjb21waWxpbmcgb24gV2luZG93cy4gKi8KIC8q
IFdlIG9ubHkgdHJ5IHRvIGRvIGV4cGxpY2l0IGlubGluaW5nIG9mIGZ1bmN0aW9ucyB3aXRoIGdj
YyBhbmQKIFN1biBTdHVkaW8gKi8KIAotIyBpZiAhZGVmaW5lZChfX0dOVUNfXykgJiYgIShkZWZp
bmVkKF9fU1VOUFJPX0MpIHx8IGRlZmluZWQoX19TVU5QUk9fQ0MpKQotIyAgdW5kZWYgIFVOSVZf
TVVTVF9OT1RfSU5MSU5FCQkJLyogUmVtb3ZlIGNvbXBpbGVyIHdhcm5pbmcgKi8KLSMgIGRlZmlu
ZSBVTklWX01VU1RfTk9UX0lOTElORQotIyBlbmRpZgotCiAjIGlmZGVmIEhBVkVfUFJFQUQKICMg
IGRlZmluZSBIQVZFX1BXUklURQogIyBlbmRpZgoK

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kevin.lewis@stripped
# target_branch: file:///Users/kevinlewis/Work/Mysql/58629/mysql-\
#   trunk-innodb/
# testament_sha1: 4250686c270c0ce7d9b4ecd126632d3f1e7549b9
# timestamp: 2011-01-21 10:14:53 -0600
# base_revision_id: kevin.lewis@stripped\
#   qv80tfh40uxc7x1f
# 
# Begin bundle
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
BkPkWMW5A4PqD+HHr/xdyRThQkEj1X7o


--===============2109644907==--