From: marko.makela
Date: June 21 2010 9:52am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3514 to 3516) Bug#54658
List-Archive: http://lists.mysql.com/commits/111669
X-Bug: 54658
Message-Id: <201006210952.o5L94Sg1000607@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1309517038=="

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

IDM1MTYgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0yMQogICAgICBCdWcjNTQ2NTg6IEFkZCBDaGFu
Z2VMb2cgZW50cnkKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0No
YW5nZUxvZwogMzUxNSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTIxCiAgICAgIEJ1ZyAjNTQ2NTg6
IElubm9EQjogV2FybmluZzogYWxsb2NhdGVkIHRhYmxlc3BhY2UgJWx1LCBvbGQgbWF4aW11bSB3
YXMgMAogICAgICAKICAgICAgZGljdF9jaGVja190YWJsZXNwYWNlc19hbmRfc3RvcmVfbWF4X2lk
KCk6IEluaXRpYWxpemUgbWF4X3NwYWNlX2lkCiAgICAgIGFuZCBmaWxfc3lzdGVtLT5tYXhfYXNz
aWduZWRfaWQgZnJvbSBESUNUX0hEUl9NQVhfU1BBQ0VfSUQuCiAgICAgIAogICAgICBmaWxfc3Bh
Y2VfY3JlYXRlKCk6IFN1cHByZXNzIHRoZSB3YXJuaW5nIHVubGVzcyAhcmVjdl9yZWNvdmVyeV9v
bgogICAgICAoZG8gbm90IGNvbXBsYWluIHdoaWxlIGFwcGx5aW5nIHRoZSByZWRvIGxvZykuCgog
ICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwbG9hZC5j
CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9maWwvZmlsMGZpbC5jCiAzNTE0IFZhc2lsIERp
bW92CTIwMTAtMDYtMTggW21lcmdlXQogICAgICBNZXJnZSBteXNxbC01LjEtaW5ub2RiIGZyb20g
YmstaW50ZXJuYWwgdG8gbXkgbG9jYWwgcmVwbwoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdl
L2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9yb3cvcm93MG1lcmdlLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6
dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDYxODA4NTE1NS14bm00NjljYmhlZHFlYTk2Cisr
KyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDA2MjEwOTUxNDgtOGc3M2s4azY4ZHBqMDgwdQpAQCAtMSwzICsxLDkgQEAK
KzIwMTAtMDYtMjEJVGhlIElubm9EQiBUZWFtCisKKwkqIGRpY3QvZGljdDBsb2FkLmMsIGZpbC9m
aWwwZmlsLmM6CisJRml4IEJ1ZyM1NDY1ODogSW5ub0RCOiBXYXJuaW5nOiBhbGxvY2F0ZWQgdGFi
bGVzcGFjZSAlbHUsCisJb2xkIG1heGltdW0gd2FzIDAgKGludHJvZHVjZWQgaW4gQnVnICM1MzU3
OCBmaXgpCisKIDIwMTAtMDYtMTYJVGhlIElubm9EQiBUZWFtCiAKIAkqIHJvdy9yb3cwbWVyZ2Uu
YzoKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGxv
YWQuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2RpY3QvZGljdDBsb2FkLmMJcmV2aWQ6
dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDYxODA4NTE1NS14bm00NjljYmhlZHFlYTk2Cisr
KyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwbG9hZC5jCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTAwNjIxMDk1MTQ4LThnNzNrOGs2OGRwajA4MHUKQEAgLTMxNiw3
ICszMTYsNyBAQCBkaWN0X2NoZWNrX3RhYmxlc3BhY2VzX2FuZF9zdG9yZV9tYXhfaWQoCiAJZGlj
dF9pbmRleF90KglzeXNfaW5kZXg7CiAJYnRyX3BjdXJfdAlwY3VyOwogCWNvbnN0IHJlY190Kgly
ZWM7Ci0JdWxpbnQJCW1heF9zcGFjZV9pZAk9IDA7CisJdWxpbnQJCW1heF9zcGFjZV9pZDsKIAlt
dHJfdAkJbXRyOwogCiAJbXV0ZXhfZW50ZXIoJihkaWN0X3N5cy0+bXV0ZXgpKTsKQEAgLTMyNyw2
ICszMjcsMTEgQEAgZGljdF9jaGVja190YWJsZXNwYWNlc19hbmRfc3RvcmVfbWF4X2lkKAogCXN5
c19pbmRleCA9IFVUX0xJU1RfR0VUX0ZJUlNUKHN5c190YWJsZXMtPmluZGV4ZXMpOwogCXV0X2Eo
IWRpY3RfdGFibGVfaXNfY29tcChzeXNfdGFibGVzKSk7CiAKKwltYXhfc3BhY2VfaWQgPSBtdHJf
cmVhZF91bGludChkaWN0X2hkcl9nZXQoJm10cikKKwkJCQkgICAgICArIERJQ1RfSERSX01BWF9T
UEFDRV9JRCwKKwkJCQkgICAgICBNTE9HXzRCWVRFUywgJm10cik7CisJZmlsX3NldF9tYXhfc3Bh
Y2VfaWRfaWZfYmlnZ2VyKG1heF9zcGFjZV9pZCk7CisKIAlidHJfcGN1cl9vcGVuX2F0X2luZGV4
X3NpZGUoVFJVRSwgc3lzX2luZGV4LCBCVFJfU0VBUkNIX0xFQUYsICZwY3VyLAogCQkJCSAgICBU
UlVFLCAmbXRyKTsKIGxvb3A6Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL2ZpbC9maWwwZmlsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9maWwvZmlsMGZp
bC5jCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDA2MTgwODUxNTUteG5tNDY5Y2Jo
ZWRxZWE5NgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vZmlsL2ZpbDBmaWwuYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMTA5NTE0OC04ZzczazhrNjhkcGowODB1CkBA
IC0xMTk3LDcgKzExOTcsNyBAQCB0cnlfYWdhaW46CiAJc3BhY2UtPnRhYmxlc3BhY2VfdmVyc2lv
biA9IGZpbF9zeXN0ZW0tPnRhYmxlc3BhY2VfdmVyc2lvbjsKIAlzcGFjZS0+bWFyayA9IEZBTFNF
OwogCi0JaWYgKFVOSVZfTElLRUxZKHB1cnBvc2UgPT0gRklMX1RBQkxFU1BBQ0UpCisJaWYgKFVO
SVZfTElLRUxZKHB1cnBvc2UgPT0gRklMX1RBQkxFU1BBQ0UgJiYgIXJlY3ZfcmVjb3Zlcnlfb24p
CiAJICAgICYmIFVOSVZfVU5MSUtFTFkoaWQgPiBmaWxfc3lzdGVtLT5tYXhfYXNzaWduZWRfaWQp
KSB7CiAJCWlmICghZmlsX3N5c3RlbS0+c3BhY2VfaWRfcmV1c2Vfd2FybmVkKSB7CiAJCQlmaWxf
c3lzdGVtLT5zcGFjZV9pZF9yZXVzZV93YXJuZWQgPSBUUlVFOwoK

--===============1309517038==
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: 1875072221f484b3e76efefa9084dd392d576950
# timestamp: 2010-06-21 12:52:18 +0300
# base_revision_id: vasil.dimov@stripped\
#   xnm469cbhedqea96
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaX5CD0ABA5flFAwe3///3/v
3+C////wBAAIAGAHp9EAAAS9DQAAAISiBRPNSm9CeQamKP1HqnqbUYGowjIZNMJ6anlNGhxkaZMT
QZMmE0yBkNAaA0yaGAE0BjjI0yYmgyZMJpkDIaA0Bpk0MAJoDDVNpQBoDRoyNAABkNAA0AABoDjI
0yYmgyZMJpkDIaA0Bpk0MAJoDCSQmjIAjIEaEyankwmSTymm01MnlPSZBk9R6hg4URxpU2lRqlqZ
mLHDC9nfYfgybFQ97Wp4/jWdZqPXkqjaY7Ru20IPYyaHbMghWQhlZZywLKyR2Gl51Im2atyg/M8+
X+2N/UpG8eMmZmGZbf1S6YFJt2PWTs3wYZqRnwe1jWQX/GG3uR83fCvihYU3Rc6g25wYcEr0q0/0
ckr2EaUdZ82pBUICiSbaumLvsMGCuxjBdc8KTMZqpHziDnsBIyC/wvpKKkS4PK1zrCidrd5hf8lq
v45pR8vFx/Sjv5HcnIB4/XnSRzf7Aj4gZCoYDUbToX0IJDvsPC1ZMVxOfQZmZuKBMvt7UInn1nOs
KcYyHOdR9t2LxF7JmByxdQPAT0h2CZAtwEM2NnY0B1EqPI+hICz3xSRZSVD0hrHn/BWyTEYIDikV
DhrGE5G4eqB5WBrDMJisrtySxtm9FE8P4kbY+I5AvOv2NsPaOQHrNQZwK8bmLcWiUloDyerpvMI7
J6x+J9cDQi5pb0s0W6heZv1FhSkUL8gL67atz4LPX3SNKjDXxmi5MBRuhOiyW+V+hWUeXKAn0Fr6
YSQDqbd+ReWNhXt/HknbUOKHlTQprEXmdAEpsM34iV/mxjiXX2TtuTik3uKHZKmGL7GqltfQQPU7
aBTuJZVuzK2SYe/+CRC8VCRhqpwLx9IJpLQZDpA7ZGoc9QUCbjoexnBd6wNlUdjkhkRX/ZmhwAoe
1J6LLYZG9vrYqTLfeRFNYn9OnQikTgoJ6k5F5EltYcA7cuFlaUjIlGrKJeTNQGqm10CdEjYzGc4a
UBSyAfcNUte6wvkBjeYnWJifTTWsygV+s0AoVloO48uy2nFtbzLK0CBXH2iktbIoM6gJk63PgTLs
NLlqNSTxjhIcTq655y1RaIpgYJJ+4Bk5K92+/K6K3UxppkFI+wYz8ZmQEi0XAVdl08mH5AcI6qx8
aC4pAtjQ5IpNjhZZD8DYqi4kTNQXRioE9SReWpHb6n6vWw2ByE9xJDMsDQcZDF5MaJRelmQREckx
UNFEgKpDEhQVhn2IxHOt0oegqWhVXgGqo+ozJlMk5cEpL2+jEQNepNJH4zG0Cgqiqw7r3XDeFcmg
8WrO0rRxoP1Hyt6XFBSwj8mP39xqGKb/3qC/ujszhgED46FR9LPkriZURb5pA6W+CcKh/E9SAiG2
x9DvW1lYUaIgu5JA5jGYBE4MgAX5ke4l8vhETTRJ34u+4ilakMpe1B4ES4PwmhH6uPgXL4iMUC8g
qPg3w1lAFf3oR+Z6CncrCkPd28NgVfdiC8i1CP0+oxwU4K/4jkjscBy8jby05R1BUbiAG+BQVHNQ
4+BIirXL7Q+ZtSGRQB8zpk8l817R31ksVgQ2ZAFCWsgBM+UuJEBSMYTHqnYJ/c0dA6Tq0cQeUOQL
FApnPApiIca3F8nQPSMOJhkbesqkcNxUNsIFgqkt5mVQJEkFrPtkU2m4sr+IHs0gYOJzA+CzY3/L
X7vsRwWb+cTl2bDWazfDgHe473gluOzZ6T5EIdRRXv53Wv6eumV67Fza2MWZnF4WIxTOA8Of9E7P
P3P3D4PCosOt8FjyeurWb97jQ1bywj6oFPc4w1/QeHmkjVqR6xdjknbr+WJz9RzJFJvL+k5gsiFk
noJgQL6arQPBId07jwO30x2TIk9qRulygMcYHpRFHqUQ4OLvV9/dR9U5ODqZahmO7qGgMOG7RPWY
wMBx8sDec7c4j8Ao7+gujyJjtyQcSIdJgegRWjzGEMUG18EV3+3ik5MB1sgqD9aVE4G3uAx8MFgb
TzOY2lJig8DvQS7zj6c7Kk3gLzs5piY6ReAnZoR9DiBzpIvSXQBcguHGxhQTIRf1jwrQJhdCv8ew
vNww47gtOaLj/J43Xkr5jJIfYnHsQjaeB4phwMOGd0GxHs3Zd3Uz3l68kiRuDpLxwUEEP/YpoIwc
mEPUUPAbzgPQ9HEuX5aJdycomiJuNiQwwDC6+47xkIhWkUriJiw94PnpDqBLYWoO8gv2QLyQYI6H
Ca3TaqyUx5p2IL+AyZKCKjQTqy/dIfSctHuqWFW1wwcYPsQB2g2mpj6mMwV956iCLaYpIkhlWbIS
Mt9RVSJyQ4TDs5DPO9IaDxxRy3VuczA5UVLageqlqYGkPEyKGPOoCDNwor1qmCcjtoHD1D0C1lVx
TAYdaUCxGIFd+8uCpBYLz5U4gJqGSieAVjahveHox3lZMWFN3z4WYrQ5slkJ8DYg1WpWpgZxC3fZ
olzsPUgO+YZMHg1u7Tik2UM5KnoFk+x/xdyRThQkKX5CD0A=


--===============1309517038==--