From: marko.makela
Date: October 21 2010 9:02am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3273) Bug#56680
List-Archive: http://lists.mysql.com/commits/121497
X-Bug: 56680
Message-Id: <201010210902.o9L85tfD022762@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0247472227=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDEwMjEwODQ4MjgtbnE2c2Ry
czNqcWZsdGFvNQoKIDMyNzMgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0yMQogICAgICByb3dfc2Vh
cmNoX2Zvcl9teXNxbCgpOiBBdm9pZCByZWNvbXB1dGluZyBvZmZzZXRzIGZvciBEQl9ST1dfSUQu
CiAgICAgIEkgbm90aWNlZCB0aGlzIHdoZW4gd29ya2luZyBvbiBCdWcgIzU2NjgwLgogICAgICBX
ZSBjYW4gcGFzcyByZXN1bHRfcmVjIHRvIHJvd19zZWxfc3RvcmVfcm93X2lkX3RvX3ByZWJ1aWx0
KCksCiAgICAgIGp1c3QgbGlrZSB3ZSBwYXNzIGl0IHRvIHJvd19zZWxfc3RvcmVfbXlzcWxfcmVj
KCkuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29t
LTIwMTAxMDIxMDg0ODI4LW5xNnNkcnMzanFmbHRhbzUKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9y
b3cvcm93MHNlbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDIxMDkwMjI4
LXZwd2JwbnFjMmFvMjRoaGcKQEAgLTQ0NjgsMTMgKzQ0NjgsMTAgQEAgcmVxdWlyZXNfY2x1c3Rf
cmVjOgogCQl9CiAKIAkJaWYgKHByZWJ1aWx0LT5jbHVzdF9pbmRleF93YXNfZ2VuZXJhdGVkKSB7
Ci0JCQlpZiAocmVzdWx0X3JlYyAhPSByZWMpIHsKLQkJCQlvZmZzZXRzID0gcmVjX2dldF9vZmZz
ZXRzKAotCQkJCQlyZWMsIGluZGV4LCBvZmZzZXRzLCBVTElOVF9VTkRFRklORUQsCi0JCQkJCSZo
ZWFwKTsKLQkJCX0KLQkJCXJvd19zZWxfc3RvcmVfcm93X2lkX3RvX3ByZWJ1aWx0KHByZWJ1aWx0
LCByZWMsCi0JCQkJCQkJIGluZGV4LCBvZmZzZXRzKTsKKwkJCXJvd19zZWxfc3RvcmVfcm93X2lk
X3RvX3ByZWJ1aWx0KAorCQkJCXByZWJ1aWx0LCByZXN1bHRfcmVjLAorCQkJCXJlc3VsdF9yZWMg
PT0gcmVjID8gaW5kZXggOiBjbHVzdF9pbmRleCwKKwkJCQlvZmZzZXRzKTsKIAkJfQogCX0KIAoK

--===============0247472227==
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: 160f6905b322c9a5adb376c7a7ff91d227d8b443
# timestamp: 2010-10-21 12:02:35 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: jimmy.yang@stripped\
#   nq6sdrs3jqfltao5
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfuplIkAAaDflEAwWmf///ci
kIC////wBAAIAFAD/rsK6zs6AAw1T1T2ijNRoBoDQ0APUDQGgekARqINEeo2ImgxAAAAAaAAyQam
TVP0E9UB6gHqHqNAA0AABzTEwEaYEYRgAAACYRgJJCaT0NU9MRknlD0k2gKaep5Q8kNNGj1DAnAx
LY12/Tnb6eh+OemRw3QxNoEJu4abNsKLIb57GYh04Dwalm6b5JTM9fXhEvzX5GTe3yTSdWtHAJ6H
qDHnbShRCB0ro1RzuH5qWNmQxDlQqJBfd/DxGewuMPU/AI9jkal8t1PH7ULVhe2Tm9YblmkbelKC
zy5nx7YC7bHeDmEPEZJnsI3CcvHjxjEL88XiqOA5hhzP+1lMPVcVaSZdkRHgwjysQctC+DOoUqXX
UY1bV7lx/db/da8PKeF2JYysHtzD76cRHOYvQRYUyGotFkypFV0KkuaBq6E0EPwBgEvtlhCclzaZ
gJFxv21Ds51nLRaxRCLZsQlBOUdqviTKbjJUxFdzcxSYaJ9jtSRX3+0iCQPtKefMJA3TE1RNBjzZ
yOhCwYjOqUElAD1y9CxEmq0mpqrN001sbo7SRttVpCxlJBKuTZLgoBAJNF2yuDbVtKAsaECyfA0q
EL6qxEVBuU2ziA+DI5kfebJOCsKQQKIgJCKRMu0aXTzYUE+RjV3sedtxx5TskusiAQZ1OMkuuBUu
VLUNTLFvsLgjCEAaiYEDIUE5ImgGKFmXxDRdZ3EUvjr9bUifZa8PLil6br5x/RXiguuyaPvWk4Zc
KlGfj6emK889Bdlqp1Bycebia2P9BWPes9JQByMsKwofJZZTxmMASGAFFCThqMUx2aydSFoELSoS
KOXqp3UmKf0ntG5Sl39vTS4FV3HnZvIT6O/si87XVSDqXhe5B2Gzl77evlc2sM61O3xbo+rihcAL
7z4TLjwyp5+rMpUBgpIqDl23k9q3LfzlNhqffl3+Kzd5sW1DZHlEcmWiHdayCPKAvkLhzLF2jZs1
mHdehqMTlgsFA+Fv4g0raIVY/XnxpyDHrCzjC7fsWql49HBN89bkv6xCtBnx6ktobXA9hEq0hi+u
3SCZdClTs6UjwS9z6DZaXrmfM55OUID4LcUPorcFz4Ceycum5PbhGC7xUbEMyZUYa8RkqkDiFtX+
a4oT6g7IlZ9kipLuerXq+dILdXvZkw4uj8xS34mEtmArEHctSvHJOAJvcpqy1k0ETcT6nEo8ZbAG
WEKvhHU8rq/1qlXVUmTWmjslg6EfRWfNMp5jGr6waRNvc3Feg0gpTk4hOXJWwaD16jnJ1eA9o4GF
ROgmVJVhQplL1O320WElSmOjbnUqw+MRXgqBXKg2MqjZqnd6cb73Ffg/J/F3JFOFCQ+6mUiQ


--===============0247472227==--