From: marko.makela
Date: June 6 2011 1:30pm
Subject: bzr push into mysql-trunk branch (marko.makela:3158 to 3159)
List-Archive: http://lists.mysql.com/commits/138702
Message-Id: <201106061330.p56DUs2b028449@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0535037350=="

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

IDMxNTkgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0wNiBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNSB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL3BhZ2UwcGFnZS5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9wYWdl
MHBhZ2UuaWMKIDMxNTggT2xhdiBTYW5kc3RhYQkyMDExLTA2LTA2CiAgICAgIFRoaXMgaXMgcHJl
cGFyYXRpb24gcGF0Y2ggZm9yIEJ1ZyMxMjM1NTk1OCAiRkFJTElORyBBU1NFUlRJT046IAogICAg
ICBUUlgtPkxPQ0suTl9BQ1RJVkVfVEhSUyA9PSAxIi4gSXQgZG9lcyBub3QgY29udGFpbiB0aGUg
Zml4IGZvcgogICAgICB0aGUgYnVnIGJ1dCB3aWxsIG1ha2UgdGhlIGJ1ZyBmaXggc2ltcGxlci9i
ZXR0ZXIuCiAgICAgIAogICAgICBUaGUgSXRlbTo6d2l0aF9zdWJzZWxlY3QgbWVtYmVyIHZhcmlh
YmxlIGlzIHB1YmxpYyBhbmQgaXMgdXNlZCAKICAgICAgZGlyZWN0bHkgaW4gY29kZSBvdXRzaWRl
IHRoZSBJdGVtIHRyZWUuIFRoaXMgcGF0Y2ggY2hhbmdlcyBpdAogICAgICB0byBiZSBwcm90ZWN0
ZWQgYW5kIGFkZHMgYSBuZXcgbWV0aG9kIEl0ZW06Omhhc19zdWJxdWVyeSgpIGZvcgogICAgICBn
ZXR0aW5nIHRoZSB2YWx1ZSBvZiBpdC4KICAgICAgCiAgICAgIFRoZSBwYXRjaCBzaG91bGQgbm90
IGNoYW5nZSBhbnkgYmVoYXZpb3IuCiAgICAgQCBzcWwvaXRlbS5jYwogICAgICAgIENoYW5nZXMg
aW4gb3JkZXIgZm9yIGluaXRpYWxpemF0aW9uIG9mIHdpdGhfc3Vic2VsZWN0IGluCiAgICAgICAg
SXRlbSBjb25zdHJ1Y3RvcnMuCiAgICAgQCBzcWwvaXRlbS5oCiAgICAgICAgTWFrZSBJdGVtOjp3
aXRoX3N1YnNlbGVjdCBwcm90ZWN0ZWQgYW5kIGFkZCBhIGdldHRlcgogICAgICAgIGZ1Y3Rpb24g
SXRlbTo6aGFzX3N1YnF1ZXJ5KCkuCiAgICAgQCBzcWwvaXRlbV9jbXBmdW5jLmNjCiAgICAgICAg
VXNlIHRoZSBuZXcgSXRlbTo6aGFzX3N1YnF1ZXJ5KCkgZnVuY3Rpb24gaW5zdGVhZCBvZiBhY2Nl
c3NpbmcKICAgICAgICBJdGVtOjp3aXRoX3N1YnNlbGVjdCBkaXJlY3RseS4KICAgICBAIHNxbC9p
dGVtX2Z1bmMuY2MKICAgICAgICBVc2UgdGhlIG5ldyBJdGVtOjpoYXNfc3VicXVlcnkoKSBmdW5j
dGlvbiBpbnN0ZWFkIG9mIGFjY2Vzc2luZwogICAgICAgIEl0ZW06OndpdGhfc3Vic2VsZWN0IGRp
cmVjdGx5LgogICAgIEAgc3FsL3NxbF9zZWxlY3QuY2MKICAgICAgICBVc2UgdGhlIG5ldyBJdGVt
OjpoYXNfc3VicXVlcnkoKSBmdW5jdGlvbiBpbnN0ZWFkIG9mIGFjY2Vzc2luZwogICAgICAgIEl0
ZW06OndpdGhfc3Vic2VsZWN0IGRpcmVjdGx5LgoKICAgIG1vZGlmaWVkOgogICAgICBzcWwvaXRl
bS5jYwogICAgICBzcWwvaXRlbS5oCiAgICAgIHNxbC9pdGVtX2NtcGZ1bmMuY2MKICAgICAgc3Fs
L2l0ZW1fZnVuYy5jYwogICAgICBzcWwvc3FsX3NlbGVjdC5jYwo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3BhZ2UwcGFnZS5oJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvcGFnZTBwYWdlLmgJcmV2aWQ6b2xhdi5zYW5kc3RhYUBvcmFjbGUuY29tLTIw
MTEwNjA2MTI0OTU1LXZ0czRxbDh5NWM4bjN0cXUKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL3BhZ2UwcGFnZS5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjA2MTMy
ODMxLWx2dm14emtxMWVkeHQzc3QKQEAgLTYxOCw2ICs2MTgsNyBAQCByZWNfdCoKIHBhZ2VfcmVj
X2ZpbmRfb3duZXJfcmVjKAogLyo9PT09PT09PT09PT09PT09PT09PSovCiAJcmVjX3QqCXJlYyk7
CS8qITwgaW46IHRoZSBwaHlzaWNhbCByZWNvcmQgKi8KKyNpZm5kZWYgVU5JVl9IT1RCQUNLVVAK
IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKi8vKioKIFdyaXRlIGEgMzItYml0IGZpZWxkIGluIGEgZGF0YSBkaWN0
aW9uYXJ5IHJlY29yZC4gKi8KIFVOSVZfSU5MSU5FCkBAIC02MjYsOSArNjI3LDEwIEBAIHBhZ2Vf
cmVjX3dyaXRlX2ZpZWxkKAogLyo9PT09PT09PT09PT09PT09PSovCiAJcmVjX3QqCXJlYywJLyoh
PCBpbi9vdXQ6IHJlY29yZCB0byB1cGRhdGUgKi8KIAl1bGludAlpLAkvKiE8IGluOiBpbmRleCBv
ZiB0aGUgZmllbGQgdG8gdXBkYXRlICovCi0JdWxpbnQJcGFnZV9ubywvKiE8IGluOiB2YWx1ZSB0
byB3cml0ZSAqLworCXVsaW50CXZhbCwJLyohPCBpbjogdmFsdWUgdG8gd3JpdGUgKi8KIAltdHJf
dCoJbXRyKQkvKiE8IGluL291dDogbWluaS10cmFuc2FjdGlvbiAqLwogCV9fYXR0cmlidXRlX18o
KG5vbm51bGwpKTsKKyNlbmRpZiAvKiAhVU5JVl9IT1RCQUNLVVAgKi8KIC8qKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZXR1
cm5zIHRoZSBtYXhpbXVtIGNvbWJpbmVkIHNpemUgb2YgcmVjb3JkcyB3aGljaCBjYW4gYmUgaW5z
ZXJ0ZWQgb24gdG9wCiBvZiByZWNvcmQgaGVhcC4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvcGFnZTBwYWdlLmljJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvcGFnZTBwYWdlLmljCXJldmlkOm9sYXYuc2FuZHN0YWFAb3JhY2xlLmNvbS0yMDExMDYw
NjEyNDk1NS12dHM0cWw4eTVjOG4zdHF1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9w
YWdlMHBhZ2UuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MDYxMzI4MzEt
bHZ2bXh6a3ExZWR4dDNzdApAQCAtOTU5LDYgKzk1OSw3IEBAIHBhZ2VfZ2V0X2ZyZWVfc3BhY2Vf
b2ZfZW1wdHkoCiAJCSAgICAgICAtIDIgKiBQQUdFX0RJUl9TTE9UX1NJWkUpKTsKIH0KIAorI2lm
bmRlZiBVTklWX0hPVEJBQ0tVUAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogV3JpdGUgYSAzMi1iaXQg
ZmllbGQgaW4gYSBkYXRhIGRpY3Rpb25hcnkgcmVjb3JkLiAqLwogVU5JVl9JTkxJTkUKQEAgLTk3
OSw2ICs5ODAsNyBAQCBwYWdlX3JlY193cml0ZV9maWVsZCgKIAogCW1sb2dfd3JpdGVfdWxpbnQo
ZGF0YSwgdmFsLCBNTE9HXzRCWVRFUywgbXRyKTsKIH0KKyNlbmRpZiAvKiAhVU5JVl9IT1RCQUNL
VVAgKi8KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKi8vKioKIEVhY2ggdXNlciByZWNvcmQgb24gYSBwYWdlLCBhbmQgYWxzbyB0
aGUgZGVsZXRlZCB1c2VyIHJlY29yZHMgaW4gdGhlIGhlYXAKCg==

--===============0535037350==
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/mysql-trunk/
# testament_sha1: fb4b254d4e983bd81526f36b63d479643a819c8f
# timestamp: 2011-06-06 16:30:49 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# base_revision_id: olav.sandstaa@stripped\
#   vts4ql8y5c8n3tqu
# 
# Begin bundle
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
kU4UJBzQIbcA


--===============0535037350==--