From: marko.makela
Date: November 3 2010 1:01pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3653 to 3654)
List-Archive: http://lists.mysql.com/commits/122772
Message-Id: <201011031301.oA3D1RRf025098@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0812746030=="

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

IDM2NTQgTWFya28gTcOka2Vsw6QJMjAxMC0xMS0wMwogICAgICByd19sb2NrX2RlYnVnX3ByaW50
KCk6IE91dHB1dCB0aGUgdGhyZWFkIElEIGluIHVuc2lnbmVkIGZvcm1hdC4KCiAgICBtb2RpZmll
ZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwcncuYwogICAgICBzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vc3luYy9zeW5jMHJ3LmMKIDM2NTMgTWFya28gTcOka2Vsw6QJMjAxMC0xMS0w
MwogICAgICBCdWcjNTc5NDcgSW5ub0RCIGRpYWdub3N0aWNzIHNob3dzIGJ0cl9ibG9ja19nZXQg
Y2FsbHMgaW5zdGVhZCBvZiByZWFsIGNhbGxlcnMKICAgICAgCiAgICAgIEltcHJvdmUgdGhlIGRp
YWdub3N0aWNzIG9mIGJ1ZmZlciBwb29sIGFjY2Vzc2VzIGZvciBCLXRyZWVzLAogICAgICBzbyB0
aGF0IHRoZSBmaWxlIG5hbWVzIGFuZCBsaW5lIG51bWJlcnMgb2YgdGhlIHJlYWwgY2FsbHMgYXJl
IHNob3duCiAgICAgIGluc3RlYWQgb2YgdGhlIGxpbmUgb2YgdGhlIGJ1Zl9wYWdlX2dldCgpIGNh
bGwgaW4gYnRyX2Jsb2NrX2dldCgpLgogICAgICAKICAgICAgYnRyX3BhZ2VfZ2V0KCk6IFJlcGxh
Y2VkIHdpdGggYSBtYWNyby4KICAgICAgCiAgICAgIGJ0cl9ibG9ja19nZXRfZnVuYygpOiBSZW5h
bWVkIGZyb20gYnRyX2Jsb2NrX2dldCgpLiBBZGQgZmlsZSwgbGluZS4KICAgICAgCiAgICAgIGJ0
cl9ibG9ja19nZXQoKTogQSBtYWNybyB0aGF0IHBhc3NlcyB0aGUgX19GSUxFX18sIF9fTElORV9f
IHRvCiAgICAgIGJ0cl9ibG9ja19nZXRfZnVuYygpLgogICAgICAKICAgICAgZGljdF90cnVuY2F0
ZV9pbmRleF90cmVlKCk6IFJlcGxhY2UgYSBidHJfcGFnZV9nZXQoKSBjYWxsCiAgICAgIHdpdGgg
YnRyX2Jsb2NrX2dldCgpLCBzaW5jZSB3ZSBhcmUgb25seSBsYXRjaGluZyB0aGUgcGFnZSwgbm90
IGFjY2Vzc2luZyBpdC4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L0NoYW5nZUxvZwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGNyZWEuYwog
ICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idHIwYnRyLmgKICAgICAgc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvYnRyMGJ0ci5pYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwcncuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9zeW5j
L3N5bmMwcncuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMzA5MTkxMi10
bHNnYjNjOHlwMW14Nm0xCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMHJ3LmMJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDExMDMxMjM4MzYta29iMnc5dmo3eWI1ajQx
bgpAQCAtODg4LDcgKzg4OCw3IEBAIHJ3X2xvY2tfZGVidWdfcHJpbnQoCiAKIAlyd3QJICA9IGlu
Zm8tPmxvY2tfdHlwZTsKIAotCWZwcmludGYoc3RkZXJyLCAiTG9ja2VkOiB0aHJlYWQgJWxkIGZp
bGUgJXMgbGluZSAlbGQgICIsCisJZnByaW50ZihzdGRlcnIsICJMb2NrZWQ6IHRocmVhZCAlbHUg
ZmlsZSAlcyBsaW5lICVsdSAgIiwKIAkJKHVsb25nKSBvc190aHJlYWRfcGYoaW5mby0+dGhyZWFk
X2lkKSwgaW5mby0+ZmlsZV9uYW1lLAogCQkodWxvbmcpIGluZm8tPmxpbmUpOwogCWlmIChyd3Qg
PT0gUldfTE9DS19TSEFSRUQpIHsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9w
bHVnaW4vc3luYy9zeW5jMHJ3LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9zeW5jL3N5
bmMwcncuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMzA5MTkxMi10bHNn
YjNjOHlwMW14Nm0xCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9zeW5jL3N5bmMwcncuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMzEyMzgzNi1rb2Iydzl2ajd5YjVq
NDFuCkBAIC05ODgsNyArOTg4LDcgQEAgcndfbG9ja19kZWJ1Z19wcmludCgKIAogCXJ3dAkgID0g
aW5mby0+bG9ja190eXBlOwogCi0JZnByaW50ZihzdGRlcnIsICJMb2NrZWQ6IHRocmVhZCAlbGQg
ZmlsZSAlcyBsaW5lICVsZCAgIiwKKwlmcHJpbnRmKHN0ZGVyciwgIkxvY2tlZDogdGhyZWFkICVs
dSBmaWxlICVzIGxpbmUgJWx1ICAiLAogCQkodWxvbmcpIG9zX3RocmVhZF9wZihpbmZvLT50aHJl
YWRfaWQpLCBpbmZvLT5maWxlX25hbWUsCiAJCSh1bG9uZykgaW5mby0+bGluZSk7CiAJaWYgKHJ3
dCA9PSBSV19MT0NLX1NIQVJFRCkgewoK

--===============0812746030==
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: b254a772b27407421ab8b44dfb3316cd2d908749
# timestamp: 2010-11-03 15:01:20 +0200
# base_revision_id: marko.makela@stripped\
#   tlsgb3c8yp1mx6m1
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSr2jBkAAkvflAAwUmf/91cm
gAC////wBAAIAFAEbeyDtDm52YdbZhJJGhPQJhM1RPU9T1Pap5TT1NMnqNNoQBKQVPyBkelT9SYg
ZAAAADQEigggGkyG0nqaBoNDQAaAOYAAAAAAAAAAEkUAaRkYSbTRT0npP1J5QeUaNMmgYqKiKgdO
XQa++hRzujWCnfWppYvc7qXFpzOYxXmMhgGm27NqPiVDyQTgEGN/t7PqxmE85/j6dxYbmQV0lGrT
faJ4h9d5mgjcdFgpAiFS33N3fpKziD17w6gvyrVrBwd1Kus24Afrt0U1EGm/YooUNyFOe7MdTMaw
g9DmZkWCZq0JkiqK0kyZInLw+IQLlaxsMCqC276S3TpYGUG0KsWpKwZjnNBgnBQoSN/od/hKCeJ1
SrALQioaPS1+sqfzjHBw6r1qk7K8LuUawxI6jbUOqyTdyNjTZFpLqWIG+Ck1AsNmUgHjtdFlN+iO
CwdFHVhm6iJg1SGQ4FsCaxIeYY0T8DhusAlxTkswDRkpChOUlSlEgEXhR4LF4fQENofnKowNV4QD
KRtttxGfjWrsVZi3ZF2OAwV7wnvZPWecqNiZi9WGIF9ONgFMITwvukZpnCmEBbVBqYkYzSZbsSOU
AgEhSw1QTQj0aZQHllLFGNVQrdB2kBcaJoTe01LIuuAvGa5ygqWSxnXCVEYSL3JUlneZDXDMErta
BjUc8GCo4nbeKlQUmhEUyJu6QPGo6cMXIMsdk2jjYjLFUwB02QoVaKp1wqpG34rLRsyYgceojE0a
jXiFchXygbT9feMxGGsugdmOhvE0aPvu20BOAt5csTIPghZn9bIf380KlcGskR2oXdgXSkNSXtOg
M4LEGLSbsBgu8OwEz8ldyv4GHQ5JMGBIwWJhPWUKyIM8lvXMOk7LUTKNyU62dlcaeDQfuToSiCRo
5KldVwt2JWQRC17rSCGYsngKFE2X6ztWbR3qum00D5MkrDGF4QNvF+432mXE0IYRTrShDuKu4YYc
hg1/HDvkbKcplZ/VxqEql0TBVhfpIbbtuROiZDsSrScQ2pyLHAjI71JtBoLoep4Dncyz9Rud68BU
VkQtcsThShjG8qzzQ0lip1ARFhkj3lU8F+brJII4I3OUbQIwLdYmC9C9LkZViVgGAVIqdAbApQmC
4hZ3VYKjzCnmC8U2aFsDyPJMhbmDGRsLa5SXKiY1K2BC5rOeAKopS2TpjjsE+93uTDJmBlxqEjZ7
E2vISmR8YjshZIpD6OWvPFbM2GCRSzX7tRNq8Y1mxQEH2PqnpUcLVPVYqBKsMEpTUtsxdor0l0FE
9cJ6U1dfNNqIFS2Oo6E6XsIzNeMBxj0CtNTeFkg4cZrcdBaoInVTRikcLYBFrxyiFpp2/zRBYI3g
Szi8gG/u/3cVOiReQFALyUdim/xl1/4u5IpwoSBV7Rgy


--===============0812746030==--