From: marko.makela
Date: June 6 2011 1:31pm
Subject: bzr push into mysql-5.5 branch (marko.makela:3428 to 3429)
List-Archive: http://lists.mysql.com/commits/138704
Message-Id: <201106061331.p56DVvTF029440@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0135549064=="

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

IDM0MjkgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0wNgogICAgICBOb24tZnVuY3Rpb25hbCBjaGFu
Z2U6IFVuYnJlYWsgdGhlIEhvdCBCYWNrdXAgYnVpbGQuCiAgICAgIAogICAgICBwYWdlX3JlY193
cml0ZV9maWVsZCgpOiBPbWl0IHRoZSBkZWZpbml0aW9uIGlmIFVOSVZfSE9UQkFDS1VQIGlzIGRl
ZmluZWQuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9wYWdl
MHBhZ2UuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcGFnZTBwYWdlLmljCiAzNDI4
IEdlb3JnaSBLb2Rpbm92CTIwMTEtMDYtMDYgW21lcmdlXQogICAgICBtZXJnZWQgdGhlIHdhcm5p
bmdzIGZpeC4KCiAgICBtb2RpZmllZDoKICAgICAgY2xpZW50L215c3FsLmNjCiAgICAgIGNsaWVu
dC9teXNxbF91cGdyYWRlLmMKICAgICAgY2xpZW50L215c3FsYWRtaW4uY2MKICAgICAgY2xpZW50
L215c3FsYmlubG9nLmNjCiAgICAgIGNsaWVudC9teXNxbGNoZWNrLmMKICAgICAgY2xpZW50L215
c3FsZHVtcC5jCiAgICAgIGNsaWVudC9teXNxbGltcG9ydC5jCiAgICAgIGNsaWVudC9teXNxbHNo
b3cuYwogICAgICBjbGllbnQvbXlzcWxzbGFwLmMKICAgICAgY2xpZW50L215c3FsdGVzdC5jYwog
ICAgICB0ZXN0cy9teXNxbF9jbGllbnRfdGVzdC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvcGFnZTBwYWdlLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS9wYWdlMHBhZ2UuaAlyZXZpZDpnZW9yZ2kua29kaW5vdkBvcmFjbGUuY29tLTIwMTEwNjA2
MTAyODA1LW1hcDExNDk0Z3k3ZGNvdzMKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3Bh
Z2UwcGFnZS5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjA2MTMyNDAxLWh1
N3M0d2h2MzJuOHBxcXUKQEAgLTYxOCw2ICs2MTgsNyBAQCByZWNfdCoKIHBhZ2VfcmVjX2ZpbmRf
b3duZXJfcmVjKAogLyo9PT09PT09PT09PT09PT09PT09PSovCiAJcmVjX3QqCXJlYyk7CS8qITwg
aW46IHRoZSBwaHlzaWNhbCByZWNvcmQgKi8KKyNpZm5kZWYgVU5JVl9IT1RCQUNLVVAKIC8qKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKIFdyaXRlIGEgMzItYml0IGZpZWxkIGluIGEgZGF0YSBkaWN0aW9uYXJ5
IHJlY29yZC4gKi8KIFVOSVZfSU5MSU5FCkBAIC02MjYsOSArNjI3LDEwIEBAIHBhZ2VfcmVjX3dy
aXRlX2ZpZWxkKAogLyo9PT09PT09PT09PT09PT09PSovCiAJcmVjX3QqCXJlYywJLyohPCBpbi9v
dXQ6IHJlY29yZCB0byB1cGRhdGUgKi8KIAl1bGludAlpLAkvKiE8IGluOiBpbmRleCBvZiB0aGUg
ZmllbGQgdG8gdXBkYXRlICovCi0JdWxpbnQJcGFnZV9ubywvKiE8IGluOiB2YWx1ZSB0byB3cml0
ZSAqLworCXVsaW50CXZhbCwJLyohPCBpbjogdmFsdWUgdG8gd3JpdGUgKi8KIAltdHJfdCoJbXRy
KQkvKiE8IGluL291dDogbWluaS10cmFuc2FjdGlvbiAqLwogCV9fYXR0cmlidXRlX18oKG5vbm51
bGwpKTsKKyNlbmRpZiAvKiAhVU5JVl9IT1RCQUNLVVAgKi8KIC8qKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZXR1cm5zIHRo
ZSBtYXhpbXVtIGNvbWJpbmVkIHNpemUgb2YgcmVjb3JkcyB3aGljaCBjYW4gYmUgaW5zZXJ0ZWQg
b24gdG9wCiBvZiByZWNvcmQgaGVhcC4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvcGFnZTBwYWdlLmljJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv
cGFnZTBwYWdlLmljCXJldmlkOmdlb3JnaS5rb2Rpbm92QG9yYWNsZS5jb20tMjAxMTA2MDYxMDI4
MDUtbWFwMTE0OTRneTdkY293MworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcGFnZTBw
YWdlLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjA2MTMyNDAxLWh1N3M0
d2h2MzJuOHBxcXUKQEAgLTk1OSw2ICs5NTksNyBAQCBwYWdlX2dldF9mcmVlX3NwYWNlX29mX2Vt
cHR5KAogCQkgICAgICAgLSAyICogUEFHRV9ESVJfU0xPVF9TSVpFKSk7CiB9CiAKKyNpZm5kZWYg
VU5JVl9IT1RCQUNLVVAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFdyaXRlIGEgMzItYml0IGZpZWxk
IGluIGEgZGF0YSBkaWN0aW9uYXJ5IHJlY29yZC4gKi8KIFVOSVZfSU5MSU5FCkBAIC05NzksNiAr
OTgwLDcgQEAgcGFnZV9yZWNfd3JpdGVfZmllbGQoCiAKIAltbG9nX3dyaXRlX3VsaW50KGRhdGEs
IHZhbCwgTUxPR180QllURVMsIG10cik7CiB9CisjZW5kaWYgLyogIVVOSVZfSE9UQkFDS1VQICov
CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKiovLyoqCiBFYWNoIHVzZXIgcmVjb3JkIG9uIGEgcGFnZSwgYW5kIGFsc28gdGhlIGRl
bGV0ZWQgdXNlciByZWNvcmRzIGluIHRoZSBoZWFwCgo=

--===============0135549064==
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-5.5/
# testament_sha1: 144a6f60da65d90ccfbf3618421ce79f97cbcabf
# timestamp: 2011-06-06 16:31:51 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: georgi.kodinov@stripped\
#   map11494gy7dcow3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSkesN0AAlfflAAwenf/93tr
xwC/7//wBAAIAFAErTzkKFmJK1oQkkk9Jpo1T8RlNpkk/Ip+kjyQ00HqPRHqfpCASUmnqamSe1T2
om1PUGg0DQGjQAGgANVP9UamgZGmg000GjQyGjQNAyA0aDmmJkyaMJgmJpgEwCGCMCMAkkCaGgmQ
NAkwKPCnqHkgDQNAjd+5p6Ne/QOc7x7+OBF11ZQgjdXBphlEsQ7FWQvfrmgMdYUiYHENBgKgkgEi
ToJzKKVZCa66EwMZUCEkiCTNF6qr5U3P9dIVz/mfn26dJ5Mgxy5JJdW4qq22DRFW00w/ACBhWhKL
GFGa3huUCszC6IWAoNooha9gDar1T7D4Y7ozyEoMLuXJI5LM8eA4wpM5kEcmHMKjP2Z+oEkLoKpz
A4aCYYTJGaRnN+0caydaIp7ZiERzYqjMKmBYKwTOK3VvjfAvZMjLHn00LXxkpqkKuzKmoYUIkn35
NPGIGqe4WEXQUa325xXdGW8WDC3bZXm2LOvc40QnTfjIzA0fgONxxHkt4ToLGCOB3Mzewi6QwFuY
w62FlVbx7OAd8wGeT5uldqFYZWE7RTx/tW5AVZMn32vTN0JlTF5BSY6LaLG9eoFWLKLFvKnMwg5a
SFmsCo4LeQFy7yicoIJEiRMkYaX3CqdS2Ak+20VJNLCE8SJULa4YeMZTxYWZqkNrIw1LAWOonYsc
QzXWodoFplOmD5CvitwovNSi944vYunfLEiUKjtApsFaM3LtkWSE5YrA1uH3X+TS3n2aY214HBlr
wu0inS2J71Gp4NU0lNE5NcL3+pZeegYlDEe83d56Xi2HemQayIFY4c52hEfDvQ1Ij5Q2hHkjcf8I
m9UPejohxUNghsEeSJLBithd34xBvcK+1LgW57j4nBI/sR97voJTe8lHgp3oc/ckaN3FnFOOmFdm
RLzgErS+4Xjmee3zeOvHDz0F6x1dWv0QMUFMqOLDxhbuYnugUEwthCXr7XW3VOZJPF8RLCxPp1DX
Y7ZXbKVhIGciBjsPcXUoZCdUZGXULCByX3K5uHQ2FMxOEvQTDJUTDYrCsftLSatpGc7KQik2WtXR
fbnztp0FRc4i6p+5snRxxSLG8yde1MFKzV1X2x6yJD0OeUG51i3u1D90jmbh44ZJ7l0Hla9v5PA7
SZxJDPPoPCiFBhPWa7F1rsN4m3EqwPzAvS4rCRbYmkinQ1ENJOy6zY8Tx56CuRilaJdmGqiGPqQ2
Xai7MzdIt38Iic5I+e1EwWo3KUj/NAtRa4A5qQk4LoYJqGFPRyCVSRsLEeh0pxNdJUj4nbbfZgZ4
dwDnBoffKAsmRtNQ6pNHF0hMERMwMpdOTAEtCSfyYXCMeYCUSI1Gu2BcpblIpZlTo3i3HFhumkRg
krb7PICPwgAx1gXZqaQfWdsEp3XKSql5FQKC2QpKEBMuPsA++8lcHGwmhioPH9/EmTFwwvse9j/Q
v9yL2pmHkxOvrtKukrUUCIpOCWaXxAyok/T+uwrF4UrAwUr7lrRoRX2gR0ii1UHetjqE//FHL/i7
kinChIFI9Ybo


--===============0135549064==--