From: marko.makela
Date: October 27 2010 6:49am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3288 to 3289)
List-Archive: http://lists.mysql.com/commits/122015
Message-Id: <201010270649.o9R6FBQ0017783@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1162935537=="

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

IDMyODkgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0yNwogICAgICBSZW1vdmUgYSByZWZlcmVuY2Ug
dG8gdXQwYXV4Y29uZi5oLAogICAgICB3aGljaCB3YXMgbmVlZGVkIHdoZW4gdGhlIElubm9EQiBQ
bHVnaW4gMS4wIHdhcyBkaXN0cmlidXRlZAogICAgICBzZXBhcmF0ZWx5IGZyb20gTXlTUUwgNS4x
LiBTb21laG93LCB0aGlzIHJlZmVyZW5jZSB3YXMgbm90IHJlbW92ZWQKICAgICAgd2hlbiB0aGUg
Y29ycmVzcG9uZGluZyBjaGFuZ2Ugd2FzIG1lcmdlZCBmcm9tIG15c3FsLTUuNS1pbm5vZGIKICAg
ICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwOTA5MTEyNzUyLWFj
NXc3enl6YnYxMG52aTEKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL3VuaXYuaQogMzI4OCBTdW5ueSBCYWlucwkyMDEwLTEwLTI3CiAgICAgIEZpeCBmb3JtYXR0
aW5nIGFuZCB3aGl0ZXNwYWNlLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl
L2hhbmRsZXIvaGFfaW5ub2RiLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvdW5pdi5pJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pCXJl
dmlkOnN1bm55LmJhaW5zQG9yYWNsZS5jb20tMjAxMDEwMjcwNjM1MTAtYmE1MmVndnAxeDNtdGtj
MworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTAxMDI3MDY0MDQ3LXllOTM0Nzl5dzBwdzV5ZmUKQEAgLTc4LDE5ICs3
OCw2IEBAIHRoZSB2aXJ0dWFsIG1ldGhvZCB0YWJsZSAodnRhYmxlKSBpbiBHQ0MKICMgZGVmaW5l
IGhhX2lubm9iYXNlIGhhX2lubm9kYgogI2VuZGlmIC8qIE1ZU1FMX0RZTkFNSUNfUExVR0lOICov
CiAKLS8qIGlmIGFueSBvZiB0aGUgZm9sbG93aW5nIG1hY3JvcyBpcyBkZWZpbmVkIGF0IHRoaXMg
cG9pbnQgdGhpcyBtZWFucwotdGhhdCB0aGUgY29kZSBmcm9tIHRoZSAicmlnaHQiIHBsdWcuaW4g
d2FzIGV4ZWN1dGVkIGFuZCB3ZSBkbyBub3QKLW5lZWQgdG8gaW5jbHVkZSB1dDBhdXhjb25mLmgg
d2hpY2ggd291bGQgZWl0aGVyIGRlZmluZSB0aGUgc2FtZSBtYWNyb3MKLW9yIHdpbGwgYmUgZW1w
dHkgKi8KLSNpZiAhZGVmaW5lZChIQVZFX0lCX0dDQ19BVE9NSUNfQlVJTFRJTlMpIFwKLSAmJiAh
ZGVmaW5lZChIQVZFX0lCX0FUT01JQ19QVEhSRUFEX1RfR0NDKSBcCi0gJiYgIWRlZmluZWQoSEFW
RV9JQl9TT0xBUklTX0FUT01JQ1MpIFwKLSAmJiAhZGVmaW5lZChIQVZFX0lCX0FUT01JQ19QVEhS
RUFEX1RfU09MQVJJUykgXAotICYmICFkZWZpbmVkKFNJWkVPRl9QVEhSRUFEX1QpIFwKLSAmJiAh
ZGVmaW5lZChIQVZFX0lCX1BBVVNFX0lOU1RSVUNUSU9OKQotIyBpbmNsdWRlICJ1dDBhdXhjb25m
LmgiCi0jZW5kaWYKLQogI2lmIChkZWZpbmVkKFdJTjMyKSB8fCBkZWZpbmVkKF9XSU4zMikgfHwg
ZGVmaW5lZChXSU42NCkgfHwgZGVmaW5lZChfV0lONjQpKSAmJiAhZGVmaW5lZChNWVNRTF9TRVJW
RVIpICYmICFkZWZpbmVkKF9fV0lOX18pCiAjIHVuZGVmIF9fV0lOX18KICMgZGVmaW5lIF9fV0lO
X18KCg==

--===============1162935537==
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: 9b258ee3f3b66e4d94326990643cb9865cbfecd6
# timestamp: 2010-10-27 09:49:14 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: sunny.bains@stripped\
#   ba52egvp1x3mtkc3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdDGwNgAAaRflAAQUmf/91cm
eAC/7//wBAAIAFAD1O7ex573riN7dr3hJIiMRpT9TaeoNMk08TVM9KAPUPU9T1PUDJAh6JGwhUZB
pvSJ6T1DJ6jEABkk2KaIyZqZRgQAAAAADJEj0mTyjJoaA0NAAAAAElImjJ6mjCNGjao0wTJowgwA
m/Uc/gPnpagTHRTVALPZo1ndu5C0acooiDnkPN0HYt7UrjieeIdNl/CL6t1bp/SByjmg4/buj4PC
Btz0aXflp+G4fG1eKHMqU4vum7/pQSOcy6uXKdSqkhfxnrwFaRyvcPGMAtq+zaAD0jmLqPFEOFoC
olPTLJCwRlKEhR1AwCnMbkBVQuF7QoiAhg+CxfrMNAMdlhFqb2UqkWsI3nnw3kz6tO+KORWUZn5n
7rVedpds30VMLJ8izmZlpJro2NVF+bCkQvlLxBATx3biC2RMcq0r4T7WbEOZ5xDCu0XsqApnNlJv
D7XMg7tvhE/DOmlXAFxvQYyGGQFnB1h5JiLgLyz5S88ra1c3yG7gVjybALhdKBsFU9sjjRwAzcTh
hTUCNU42blbIYZolSoZratJNSBQ5sGDzfAGMSwXjKbL4nUbtTjZxduV8sMVF2RczNILr6AVNyWcG
iz5BwnISBitcSEjvymjp4NDFFGJQD4CFj6QlewRzxOEORS5ZszjJj0lRPF9yBET74vkRR14uXZ3w
fqy0sGjlERuDea1xVdR5nEDxnI7sdIKt7yPg1OA1zzwTOaLnCBqDG8WGSas0V5Xx5kxS+PUsVgn5
HWQ23BnXyXsOz2Ypq1iPJ1oTufAo8UPa6TEALTUA1+UNCMrdfARziXlLnAd1E9JrM1uow69YtKmM
tBt7k7F5pSAQOALE1Y/+t4gw6uFrxxYqgOEpQxe1ZYbCi9j027RyOV2AgmHmwe8AZJ/FoEAoUPCe
d9D3R11SRDIyJ0i8rL4RXlutVo9KD3j9hQdsLqGPVhnEyNWEq9MGqaoG3E3NOyuyzjD4ivMWNo9T
wmyVGjYnj6cO6uCiOU1rvthknR5aUS26VH7bXptKnA7QDWg1upBoNeBP2QTCKR1eBeLB9CTgKuBx
GYKZVbhdbRjGFYZR3F1ChiKIBokxiggKNdwP7EQOgvQZEMyZYRK3jWwD1QtYL8NIj44PjOwKUJlF
kepaZnZNjOerELhD2rZ9iXa/FTeAAxqlwYRS/qDw8ZuFyBI0TEbIsilCwGMzGxq8g0pXKREKRxpT
0IHAggF0pVaz6jcjnLMcELb6qNC9QIlEcXsMt6gW4idhpAQWXQFTmoGgRkaCuQGUHdCRaFviZYDF
XRpThUJoqdwslEtBjj3+S5H/i7kinChIaGNgbAA=


--===============1162935537==--