From: marko.makela
Date: January 26 2011 8:14am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3691 to 3692) Bug#59585
List-Archive: http://lists.mysql.com/commits/129688
X-Bug: 59585
Message-Id: <201101260815.p0Q7ITL7017026@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1156737924=="

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

IDM2OTIgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0yNQogICAgICBCdWcjNTk1ODUgRml4IDU4OTEy
IGludHJvZHVjZXMgY29tcGlsZXIgd2FybmluZwogICAgICBkdWUgdG8gcG90ZW50aWFsbHkgdW5p
bml0aWFsaXplZCB2YXJpYWJsZQogICAgICAKICAgICAgcm93X3VwZF9jaGFuZ2VzX29yZF9maWVs
ZF9iaW5hcnkoKTogSW5pdGlhbGl6ZSBkZmllbGRfbGVuIHRvIHN1cHByZXNzIHRoZQogICAgICB3
YXJuaW5nLiBUaGUgY29tcGlsZXIgY2Fubm90IGtub3cgdGhhdCByb3dfZXh0X2xvb2t1cCgpIGRv
ZXMgaW5pdGlhbGl6ZQogICAgICBkZmllbGRfbGVuIGZvciB1cywgYXMgaXQgaXMgZGVmaW5lZCBp
biBhIGRpZmZlcmVudCBtb2R1bGUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9DaGFuZ2VMb2cKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwdXBk
LmMKIDM2OTEgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0yNQogICAgICBCdWcjNTk0ODYgSW5jb3Jy
ZWN0IHVzYWdlIG9mIFVOSVZfVU5MSUtFTFkoKSBpbiBtbG9nX3BhcnNlX3N0cmluZygpCiAgICAg
IAogICAgICBtbG9nX3BhcnNlX3N0cmluZygpOiBFbmNsb3NlIHRoZSBjb21wYXJpc29uIGluIFVO
SVZfVU5MSUtFTFksCiAgICAgIG5vdCB0aGUgY29tcGFyYW5kLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9tdHIvbXRyMGxvZy5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVn
aW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTI1MTAxNzI4LTVtMjJxcnc1NTU4cGltajAK
KysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDExMDEyNTEzNDMwOC1jbGUyNGlnNnVrd2U3encyCkBAIC0xLDUgKzEsMTEg
QEAKIDIwMTEtMDEtMjUJVGhlIElubm9EQiBUZWFtCiAKKwkqIHJvdy9yb3cwdXBkLmM6CisJQnVn
IzU5NTg1IEZpeCA1ODkxMiBpbnRyb2R1Y2VzIGNvbXBpbGVyIHdhcm5pbmcKKwlkdWUgdG8gcG90
ZW50aWFsbHkgdW5pbml0aWFsaXplZCB2YXJpYWJsZQorCisyMDExLTAxLTI1CVRoZSBJbm5vREIg
VGVhbQorCiAJKiBtdHIvbXRyMGxvZy5jOgogCUJ1ZyM1OTQ4NiBJbmNvcnJlY3QgdXNhZ2Ugb2Yg
VU5JVl9VTkxJS0VMWSgpIGluIG1sb2dfcGFyc2Vfc3RyaW5nKCkKIAoKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHVwZC5jJwotLS0gYS9zdG9yYWdlL2lu
bm9kYl9wbHVnaW4vcm93L3JvdzB1cGQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDEyNTEwMTcyOC01bTIycXJ3NTU1OHBpbWowCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9yb3cvcm93MHVwZC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTI1MTM0
MzA4LWNsZTI0aWc2dWt3ZTd6dzIKQEAgLTEyNTIsNiArMTI1MiwxMCBAQCByb3dfdXBkX2NoYW5n
ZXNfb3JkX2ZpZWxkX2JpbmFyeSgKIAkJICAgIHx8IGRmaWVsZF9pc19udWxsKGRmaWVsZCkpIHsK
IAkJCS8qIGRvIG5vdGhpbmcgc3BlY2lhbCAqLwogCQl9IGVsc2UgaWYgKFVOSVZfTElLRUxZX05V
TEwoZXh0KSkgeworCQkJLyogU2lsZW5jZSBhIGNvbXBpbGVyIHdhcm5pbmcgd2l0aG91dAorCQkJ
c2lsZW5jaW5nIGEgVmFsZ3JpbmQgZXJyb3IuICovCisJCQlkZmllbGRfbGVuID0gMDsKKwkJCVVO
SVZfTUVNX0lOVkFMSUQoJmRmaWVsZF9sZW4sIHNpemVvZiBkZmllbGRfbGVuKTsKIAkJCS8qIFNl
ZSBpZiB0aGUgY29sdW1uIGlzIHN0b3JlZCBleHRlcm5hbGx5LiAqLwogCQkJYnVmID0gcm93X2V4
dF9sb29rdXAoZXh0LCBjb2xfbm8sICZkZmllbGRfbGVuKTsKIAoK

--===============1156737924==
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/5.1-innodb/
# testament_sha1: 85b3a675976746e67c64d913bd47d3fba6ef1e5a
# timestamp: 2011-01-26 10:14:54 +0200
# base_revision_id: marko.makela@stripped\
#   5m22qrw5558pimj0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUb0SSwAAmbflAAwW3f//38n
DwC////wBAAIAFAFTPa9toC2rRkMVSwklDUyZJ6nqT/UYo9NEPTUT1PaUGaEaMT1MT1BzRkxMAEx
GBGmBBiMEyYBGDVPQmKGmTTQyDEAAAAGgAAkSTJkRNGjUzTUZlPRA9TQ0YgAAAkkI1PRo1Mp5CYp
mJT8qbU09NQ9IyeoBtTaQwMDMz4CBn8tH7p5t3juks55ckB+t1srFEsdqhlrhiBOVEibGk0t1KDE
tUT4bEYIiImJLXBiBlbhg48YHbV6BKOyknfrSBUdfs4KG6BMq53P4CSNIeGRAX1+IC3hVMQiDRCe
MsYUhAPWNxdMsmMsPfqdwG3W7cVLgJzAVnoZqJQfPc6jC5w/Zg7HFyaEZeG1Ci3oyBWhkJpNDv41
FlM9tm0N6S7EKfDP2GohdE3QSKM1flNyS7UQEF8NDRu6hF7ijBq1c/5WDnyZEZQqpWhXTv8b6GSB
a5g1exy7Y0Kb64x2JyJxkLEpYHP6auE6DANqqNd8TpaeJH5IxoGt0MedJFRQZGZnhqz7THeW3Fg8
g1hqPWwVJ2018obuagFeeiSZiFmiU9OiSK2fcgq1cjCNoTOvBwF+RXsha8DWVEDCtDzYa2V8SJU/
jPufoN89TBDAcOA0pxZEeRmPaoortaOUDaQOp9yChAYd6x1vDJgL6cXmJhbsBwVBKoj1aJIsMyQf
EeORUONJlAcSRrzCWWi4kOjus4Wv2IfjiFlaNZ7gLn9V5xeEUVaVQnSCHwNGb6Day806Q3kRtMTR
IB87aaggBBE4QzQ6ldZgSM64FHaW0nug8qCVEY79KxwRCI4qMnvuKwurJeVLYlmsnAo38+Z33oyy
VIB1c1ZF9XZTw2rQejhWhZDYQwtZqL3lCjsQvfsnmZhmG8vpf5k/p0Sb5zMMlv/vpA+cVC+6r1m4
ozSe+eOw8GnubW5yHod5nm4K5J4rtCV+tC6+7Xnp2myDv7RLVllwMrkdaFXMlijrKo1mCq2aXxNs
0LrCzrfJjxsR4ZHUbx54Q6HWRPe0DFdordMjUu3ckyqMOopiQYG3ai8nlRadcdGKXgzI2T2fXkxG
shxycrXsJfkBeJWXBlG8HcA1UfrKjZnfINANe9HO3k5ETwwRcUk5HfOB6WpxOSrrdae3uPYznm0Z
AY8DLgQA+EKjDZ8A49AJEzoT4nezrlOMijhzP0THUQ9V2ZfB9+O6iJq/WA8ELSJsqV4VGCgBnxBx
QOrz9N1J0WGeHjntGR8ciIZJ0fJ7HPUchbpLROKoBQoF9qPoczMv9va9fcOxZMfaOtAwcmQ2+83C
9U7YdC14+iGKbRwMw1mnqQ2QqsgzAeL607ArGDUcOd3JEtNDBjQxT5vN2UaI7iq9Dd9gcvkbjQMM
zwvqTU4exC+m5E8xLjxA7AvRe5JGk2G8JUggBmCGLILROC6u2UFoxQvOD3IWkPidaZHfzqpLMcjC
3FOakF2RsIhrfdCV1E4SuYpBzWC8u7WQoifKtdkFyYNapeFNCumSV/OHmr9qQWo5bJFzf2JXo3QX
N6o4t8H6BFplhq42MJIkqsOwMKEyKdaOLjtCbTSDYnEkqU4yUCrHxeJaEwYqEtPRSY4cHzmW2L+g
dNiBkz+bjhd8oNmdtcB2WRBlqGuqvR0OeOS2Xlk2z+IzO4yVDnZWs4Cp3sSiwRcKSugJ7yPadwEa
62Krp8gyqKrqOLlzfmipBzAtBxFbZgOwIi3xkMqfXwqkA0mPAD/Evj/xdyRThQkEb0SSwA==


--===============1156737924==--