From: marko.makela
Date: November 2 2010 7:28am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3647)
List-Archive: http://lists.mysql.com/commits/122487
Message-Id: <201011020728.oA27JFVJ004301@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0766981906=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpjYWx2aW4uc3VuQG9yYWNsZS5jb20tMjAxMDEwMjgwNTEwMjgtamdkNWl6
ZXlnamZrd215NgoKIDM2NDcgTWFya28gTcOka2Vsw6QJMjAxMC0xMS0wMgogICAgICBXaGl0ZS1z
cGFjZSBjb3JyZWN0aW9ucyBpbiB0aGUgSW5ub0RCIFBsdWdpbiBDaGFuZ2VMb2cKCiAgICBtb2Rp
ZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDpjYWx2aW4uc3VuQG9yYWNsZS5jb20tMjAxMDEwMjgw
NTEwMjgtamdkNWl6ZXlnamZrd215NgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdl
TG9nCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTAyMDcyODA1LWd2bnc4N3Bm
aXVmZTRheHUKQEAgLTEsMTMgKzEsMTMgQEAKIDIwMTAtMTAtMjQJVGhlIElubm9EQiBUZWFtCiAK
IAkqIHJvdy9yb3cwbXlzcWwuYwotCUZpeCBCdWcgIzU3NzAwIExhdGNoaW5nIG9yZGVyIHZpb2xh
dGlvbiBpbgorCUZpeCBCdWcjNTc3MDAgTGF0Y2hpbmcgb3JkZXIgdmlvbGF0aW9uIGluCiAJcm93
X3RydW5jYXRlX3RhYmxlX2Zvcl9teXNxbCgpCiAKIDIwMTAtMTAtMjAJVGhlIElubm9EQiBUZWFt
CiAKIAkqIGRpY3QvZGljdDBsb2FkLmMKLQlGaXggQnVnICM1NzYxNiBTaWcgMTEgaW4gZGljdF9s
b2FkX3RhYmxlKCkgd2hlbiBmYWlsZWQgdG8gbG9hZAorCUZpeCBCdWcjNTc2MTYgU2lnIDExIGlu
IGRpY3RfbG9hZF90YWJsZSgpIHdoZW4gZmFpbGVkIHRvIGxvYWQKIAlpbmRleCBvciBmb3JlaWdu
IGtleQogCiAyMDEwLTEwLTE5CVRoZSBJbm5vREIgVGVhbQpAQCAtMTcsNyArMTcsNyBAQAogCWlu
Y2x1ZGUvaWJ1ZjBpYnVmLmgsIGluY2x1ZGUvcm93MG15c3FsLmgsCiAJcm93L3JvdzBteXNxbC5j
LCByb3cvcm93MHNlbC5jLAogCWlubm9kYl9idWc1NjY4MC50ZXN0LCBpbm5vZGJfYnVnNTY2ODAu
cmVzdWx0OgotCUZpeCBCdWcgIzU2NjgwIElubm9EQiBtYXkgcmV0dXJuIHdyb25nIHJlc3VsdHMg
ZnJvbSBhCisJRml4IEJ1ZyM1NjY4MCBJbm5vREIgbWF5IHJldHVybiB3cm9uZyByZXN1bHRzIGZy
b20gYQogCWNhc2UtaW5zZW5zaXRpdmUgY292ZXJpbmcgaW5kZXgKIAogMjAxMC0xMC0xOAlUaGUg
SW5ub0RCIFRlYW0KQEAgLTYxLDcgKzYxLDcgQEAKIDIwMTAtMDgtMDMJVGhlIElubm9EQiBUZWFt
CiAKIAkqIGluY2x1ZGUvZGljdDBkaWN0LmgsIGluY2x1ZGUvZGljdDBkaWN0LmljLCByb3cvcm93
MG15c3FsLmM6Ci0JRml4IGJ1ZyAjNTQ2NzgsIElubm9EQiwgVFJVTkNBVEUsIEFMVEVSLCBJX1Mg
U0VMRUNULCBjcmFzaCBvciBkZWFkbG9jaworCUZpeCBCdWcjNTQ2NzggSW5ub0RCLCBUUlVOQ0FU
RSwgQUxURVIsIElfUyBTRUxFQ1QsIGNyYXNoIG9yIGRlYWRsb2NrCiAKIDIwMTAtMDgtMDMJVGhl
IElubm9EQiBUZWFtCiAKQEAgLTEzNSw3ICsxMzUsNyBAQAogCiAJKiBkaWN0L2RpY3QwbG9hZC5j
LCBmaWwvZmlsMGZpbC5jOgogCUZpeCBCdWcjNTQ2NTg6IElubm9EQjogV2FybmluZzogYWxsb2Nh
dGVkIHRhYmxlc3BhY2UgJWx1LAotCW9sZCBtYXhpbXVtIHdhcyAwIChpbnRyb2R1Y2VkIGluIEJ1
ZyAjNTM1NzggZml4KQorCW9sZCBtYXhpbXVtIHdhcyAwIChpbnRyb2R1Y2VkIGluIEJ1ZyM1MzU3
OCBmaXgpCiAKIDIwMTAtMDYtMTYJVGhlIElubm9EQiBUZWFtCiAKCg==

--===============0766981906==
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: ae6c250ec57f8ecb306a7cb7aa60ced82db512fd
# timestamp: 2010-11-02 09:28:23 +0200
# base_revision_id: calvin.sun@stripped\
#   jgd5izeygjfkwmy6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSONGYoAAbrflAAwWmf/938n
XoC////wBAAIAFAELtub2xt1adarzz28JKJoTBGlP00yaGiT9NKeoD1H6U9TRiPFGmgSkCnpk0NN
GpqT1HmpqA0GgDEGgaeoCUFMEKbTRGptRsUPahNMAExDTATBiQjRNqTamQME0DRiAANMIBoJKTEU
9T0ek01GMk9Ro000GTRoaGmgBoYiZFOjjJ8fx3v+HU+0UaqjqmBOrgsaa39UDdTcVPTm8wGI2/Yn
4fOhWqgiKUkg9j/YaPwBNnhFb2Xytz64t9Uhkd/KrucxZey/T8VuYuKwi92G9u2wuz149KLUg5D9
lCt5ZVw5eFfj1N/pUI7HtJB8Vd9Y5bG7KIbGNSNqUSfszO8I1ITU/PQwysr22M9VzxiqIMIcAoEl
EWpAmo+qIl7uCpvI5J+YtQiooqO/POMDeZEOmQi5IpLejuPP0x2CZQdsaQivofXlEanE80cDrKmc
4er3MJmFFLoy5fSLopHO1X8EcDJeGyMTBMWHdjcXGhqCwreOxL1pmyu2yZ6GkiEGKDJddFLVFNgp
JcRqsuRlG1couVQDhYaF07uWImtaDEuOzgCr2qvYlFtMX2G1LMzAsR+T072yxu6VCyGzR120qPyy
glLjw8wox8sSj8uGrmiYmYWkygpTZzSZJzxtNFZCRiTIwIo5kSDCNbIbRPLhafCA3K8nrIS0UFUo
4pqpoIE5bhjo1BVfZGVMbZa1jCy+oiyLNYlAnRewycF+Ir/Dmjd7sphAqkpPL8qXGxMPo+j9t6GN
1qwxdvF6s/QMIQj6tmHE3qsJ/9zJO1+6npZm0MC9/IxppgVB9SSV1Yb6JrP5wlu+5zSLeDJi8ofD
DglhxVc0C5VBHjR5xpYQtLWZ2aBM0wL1dUeAymENI4NPHi3jEtAEDO2wnJSSe0RqAkH/Im12sLe6
BzEjmkR3jrqoGmllN2SGfkqZ1CmtjfIE3JzM2Ta/OSuuHRRG7TQZ2ArAnnFLvp01V+y57ESXAJKD
mqT3aUH36w581bq64cVQ7lnaBPA7UUisTSui2E12EQoFCnsRloq2bDOXZjOLWZCPzujoEzyWlp3M
ZjlcREyIo1NO0GA9+ZZBV077Ig7AqhmettKTzFrJ5JcEyB476FQ4zdqlvYXLcE+6bsW1Pwy6AZeP
BFfQLWDJOnqUM91RKFivJftYcAFpWBbC3EkYzl5pkhqkqv1TbZHenHEppn2JHzS6GAynbSshG7Ka
o2ucNdwLESmaLMUJFUUF4HY9gnEXfQvyAQpIcEUeMG/j5kTCc75W0PMCjS7CAXEc7mQ2/skVANIz
9rzaiPlrnnVUchpEnnh1wz7QMiJgmJr4IWk8GJ4QAkll5k0xujNQnLbqGytoxRUam0CyMFqkRBda
NOtVy8RGTpNtob1OwrIZa6ISQsetLb5ITFME7EH5w3KCb6TJjKoDoBgC4YiqiLUxQOOtlJI7kDX3
zRI6RD+J9f+LuSKcKEgRxozFAA==


--===============0766981906==--