From: marko.makela
Date: January 19 2011 12:14pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3440 to 3441) WL#5458
List-Archive: http://lists.mysql.com/commits/129176
Message-Id: <201101191214.p0JBEDPc029303@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0407597495=="

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

IDM0NDEgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0xOQogICAgICBNYWtlIFVOSVZfU1lOQ19ERUJV
RyBhIG5vdGNoIHN0cmljdGVyIGFmdGVyIFdMIzU0NTguCiAgICAgIAogICAgICBzcnZfaW5pdCgp
OiBBc3NpZ24gYSBsYXRjaCBsZXZlbCB0byBzcnZfc3lzLT50YXNrc19tdXRleC4KICAgICAgCiAg
ICAgIHN5bmNfdGhyZWFkX2FkZF9sZXZlbCgpOiBBc3NlcnQgdGhhdCB0aGUgdGhyZWFkIG11c3Qg
b3duIHRoZSBsb2NrX3N5cy0+bXV0ZXgKICAgICAgaW4gb3JkZXIgdG8gYmUgYWJsZSB0byBhY3F1
aXJlIG11bHRpcGxlIHRyeC0+bXV0ZXguCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2Uvc3J2L3NydjBzcnYuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3N5bmMvc3luYzBzeW5j
LmMKIDM0NDAgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0xOQogICAgICBGaXggYW4gZXJyb3IgaW50
cm9kdWNlZCBpbiByMzQzOS4KICAgICAgCiAgICAgIHRyeF9jb21taXRfZm9yX215c3FsKCk6IFJl
cGxhY2UgdGhlIHRyeF9zdGFydF9pZl9ub3Rfc3RhcnRlZF94YSgpIGNhbGwKICAgICAgd2l0aCBh
IGNoZWNrIG9mIHRyeC0+c3RhdGUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2UvdHJ4L3RyeDB0cnguYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9zcnYv
c3J2MHNydi5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmMJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMTkxMTIyNDUtZTB6cGJnaXJrMWM0dDZkMworKysg
Yi9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTAxMTkxMjEzNDctajZ1aHdvaTBqamdlOGRpbgpAQCAtOTMxLDcgKzkzMSw3IEBA
IHNydl9pbml0KHZvaWQpCiAJbXV0ZXhfY3JlYXRlKHNydl9zeXNfbXV0ZXhfa2V5LCAmc3J2X3N5
cy0+bXV0ZXgsIFNZTkNfVEhSRUFEUyk7CiAKIAltdXRleF9jcmVhdGUoc3J2X3N5c190YXNrc19t
dXRleF9rZXksCi0JCSAgICAgJnNydl9zeXMtPnRhc2tzX211dGV4LCBTWU5DX05PX09SREVSX0NI
RUNLKTsKKwkJICAgICAmc3J2X3N5cy0+dGFza3NfbXV0ZXgsIFNZTkNfQU5ZX0xBVENIKTsKIAog
CXNydl9zeXMtPnN5c190aHJlYWRzID0gKHNydl9zbG90X3QqKSAmc3J2X3N5c1sxXTsKIAoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMHN5bmMuYycKLS0tIGEv
c3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwc3luYy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTEwMTE5MTEyMjQ1LWUwenBiZ2lyazFjNHQ2ZDMKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9zeW5jL3N5bmMwc3luYy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEw
MTE5MTIxMzQ3LWo2dWh3b2kwampnZThkaW4KQEAgLTExOTgsNiArMTE5OCwxMyBAQCBzeW5jX3Ro
cmVhZF9hZGRfbGV2ZWwoCiAJCX0KIAkJYnJlYWs7CiAJY2FzZSBTWU5DX1RSWDoKKwkJLyogRWl0
aGVyIHRoZSB0aHJlYWQgbXVzdCBvd24gdGhlIGxvY2tfc3lzLT5tdXRleCwgb3IKKwkJaXQgaXMg
YWxsb3dlZCB0byBvd24gb25seSBPTkUgdHJ4LT5tdXRleC4gKi8KKwkJaWYgKCFzeW5jX3RocmVh
ZF9sZXZlbHNfZyhhcnJheSwgbGV2ZWwsIEZBTFNFKSkgeworCQkJdXRfYShzeW5jX3RocmVhZF9s
ZXZlbHNfZyhhcnJheSwgbGV2ZWwgLSAxLCBUUlVFKSk7CisJCQl1dF9hKHN5bmNfdGhyZWFkX2xl
dmVsc19jb250YWluKGFycmF5LCBTWU5DX0xPQ0tfU1lTKSk7CisJCX0KKwkJYnJlYWs7CiAJY2Fz
ZSBTWU5DX0JVRl9GTFVTSF9MSVNUOgogCWNhc2UgU1lOQ19CVUZfUE9PTDoKIAkJLyogV2UgY2Fu
IGhhdmUgbXVsdGlwbGUgbXV0ZXhlcyBvZiB0aGlzIHR5cGUgdGhlcmVmb3JlIHdlCgo=

--===============0407597495==
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.6-innodb/
# testament_sha1: 1c5cd7cefa15f58baa7876a309fcfbe89d5bf118
# timestamp: 2011-01-19 14:14:18 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   e0zpbgirk1c4t6d3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWet7GbYAAm5flCAwe3f//3/v
n6C////6BAAIAFAFLJ7RHabrqGVYtUCSUyDU0DTEjT1PSm9JlB6npNBpoDIGjGhGmgSiQp7TSan6
p6empPUAAAABpoAAAACSIRomlPZMk2qeiPKaPQQAAANA0GmTQOGmmCGQ00yMmEA00AYTRpkwAIGg
kkRomJ6Cap+UNop6TTDU9QyBoBPUwAAaHOScMwFnfTm/tXXJvyXOYbp+Z0lslgyz270+QFLIxJCj
o7EouxoWjkqs5dRaWDMyZrfqHNGfZcLtW2mh5BJv7xG3g1dLr7a7fLCiPO8D9T++HLk/LUqRiSyy
auZZQiFTg+MaOCaGb3v08de5vo73Xx+bkQOZHPlUoymPRpxZIdg/dNdFJ0Ujjn45r/Fn0sRP8wuX
uQu0XwFqJRigVqry+nugV8dk9Bw0TZaxmbtCUORCu289piNGctjKk1bmZPc+4Q2+LORiyFQCuExM
CGMjGDEaqGBlkq0Tjzi5wMQzrsWq3Pa5RYKd1QJ3f5uybq5QV6wMHgpYOFSmgBQolMl742bJioDl
D1vYmefmN8nrEzvFPMdFz0houJBhYK+TDTotmMpEJxFgJmWN52J1vEiqE07FjijayOrwsM3sEQfd
sqL5DwOnZdjlfCL72CrAxsFnKLCqkWUkDj02F8Ky9lAm6re6KwISmAxrtc3FLSKy2sJq8nLKtFEC
O9Tn9tUQwjWaxLiD0JCcS8TsmnyoNmtdYMi8R1Y59QTFYl6yWI8p2q79Aa9ON4G+w6SNeIoJ14tO
Fpbe4MBiybNnMSpi2IkpkCTDLmMOu0LRBBS48W1ccjEoKVpog8CIkl0VEG4aViQFthJEnlpFGm0N
i9J1WDBzlbhVIuiqHBptJVInU1QqzY3pVu7gFmDNwkHMd827wsYrBL8fzlwmKdmGYbkOzbtUze7t
6oXjCIf1St+4HXsJuhZapXSzUQhNmk/PxvzNnDNmK26OfYdf4J9xm2ep0SCS6oBxkDoCsvIBmO6O
OflFuJSPQhTDuvv0+nyCTpxZW4yF8kXy/ndQvNTPKUzIZEpzQvmqB8GubGpbNItvSMdJj0vsYdiL
RTcobur0HgSYMRViZZ9YVoI9kUoecURSmw6+Ahqtb2jhKsSu4Xy7HDaOHeIihoqDf9BOEw6SCKLm
VNflE/W2oWS9IGabl4O0cRQw4QUqv4RqfqNhWQA5TjJ4a2HUkETmBEUWf1ZdeWzhyNXdbrBqLmp7
oixCkTUKJMGUp4DM6ksz2FiUESJDnzCv6FcMeNVMZRbhUvFeXR4Go1ljE+BvIRfcBka1RxBviwRO
yW0CpHMA8twy4C1ua1DTbtKjqnFGPK8MSqYo0Iiffv8W7LHgRPVrWDSiinn0QOGzGBqA4QNmugTa
VvuGEvxvIkEqjWAyM7kBdE2bcglAIlTMsmLac8jJtsTythvoU5PxoW8HIfJMPr0KZC41VRisy7d7
MxStfedhgmwwTek4kKEERY0NgKD4U4KLKLAy4ODtAyFpJ39QDUkpo4rISHfESoQ6lanqiNUFi2LD
BUnqSXPmtm4q4XF7I5HpBbwVJ1/YJ8yU92RT21wUoleTn0PUhHGLQCYiU2QXrSSwm44vZas4+hDi
onDb7lmTHbu69Ef+Mh1iHtMoJiENh4YgxY6Dec672J2McbQaXykdkerRmgKsMmRnYrCiivAmgEUV
pmkE8leGbg8QHjs5JhUOPAMJ4tLCySpTIsosDtgSKAwFroJjw1IB9gQpVsf6Uef/C7kinChIdb2M
2wA=


--===============0407597495==--