From: marko.makela
Date: November 3 2010 12:38pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3654)
List-Archive: http://lists.mysql.com/commits/122673
Message-Id: <201011031239.oA3COLSR025539@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1416198326=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMzA5MTkxMi10bHNn
YjNjOHlwMW14Nm0xCgogMzY1NCBNYXJrbyBNw6RrZWzDpAkyMDEwLTExLTAzCiAgICAgIHJ3X2xv
Y2tfZGVidWdfcHJpbnQoKTogT3V0cHV0IHRoZSB0aHJlYWQgSUQgaW4gdW5zaWduZWQgZm9ybWF0
LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3N5bmMvc3luYzBydy5jCiAg
ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9zeW5jL3N5bmMwcncuYwo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwcncuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFz
ZS9zeW5jL3N5bmMwcncuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMzA5
MTkxMi10bHNnYjNjOHlwMW14Nm0xCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMHJ3
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDExMDMxMjM4MzYta29iMnc5dmo3
eWI1ajQxbgpAQCAtODg4LDcgKzg4OCw3IEBAIHJ3X2xvY2tfZGVidWdfcHJpbnQoCiAKIAlyd3QJ
ICA9IGluZm8tPmxvY2tfdHlwZTsKIAotCWZwcmludGYoc3RkZXJyLCAiTG9ja2VkOiB0aHJlYWQg
JWxkIGZpbGUgJXMgbGluZSAlbGQgICIsCisJZnByaW50ZihzdGRlcnIsICJMb2NrZWQ6IHRocmVh
ZCAlbHUgZmlsZSAlcyBsaW5lICVsdSAgIiwKIAkJKHVsb25nKSBvc190aHJlYWRfcGYoaW5mby0+
dGhyZWFkX2lkKSwgaW5mby0+ZmlsZV9uYW1lLAogCQkodWxvbmcpIGluZm8tPmxpbmUpOwogCWlm
IChyd3QgPT0gUldfTE9DS19TSEFSRUQpIHsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vc3luYy9zeW5jMHJ3LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9z
eW5jL3N5bmMwcncuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMzA5MTkx
Mi10bHNnYjNjOHlwMW14Nm0xCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9zeW5jL3N5bmMw
cncuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMzEyMzgzNi1rb2Iydzl2
ajd5YjVqNDFuCkBAIC05ODgsNyArOTg4LDcgQEAgcndfbG9ja19kZWJ1Z19wcmludCgKIAogCXJ3
dAkgID0gaW5mby0+bG9ja190eXBlOwogCi0JZnByaW50ZihzdGRlcnIsICJMb2NrZWQ6IHRocmVh
ZCAlbGQgZmlsZSAlcyBsaW5lICVsZCAgIiwKKwlmcHJpbnRmKHN0ZGVyciwgIkxvY2tlZDogdGhy
ZWFkICVsdSBmaWxlICVzIGxpbmUgJWx1ICAiLAogCQkodWxvbmcpIG9zX3RocmVhZF9wZihpbmZv
LT50aHJlYWRfaWQpLCBpbmZvLT5maWxlX25hbWUsCiAJCSh1bG9uZykgaW5mby0+bGluZSk7CiAJ
aWYgKHJ3dCA9PSBSV19MT0NLX1NIQVJFRCkgewoK

--===============1416198326==
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 14:39:09 +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


--===============1416198326==--