From: marko.makela
Date: October 21 2010 10:33am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3272 to 3273) Bug#56680
List-Archive: http://lists.mysql.com/commits/121503
X-Bug: 56680
Message-Id: <201010211034.o9L8vbiJ030647@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0234316155=="

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

IDMyNzMgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0yMQogICAgICByb3dfc2VhcmNoX2Zvcl9teXNx
bCgpOiBBdm9pZCByZWNvbXB1dGluZyBvZmZzZXRzIGZvciBEQl9ST1dfSUQuCiAgICAgIEkgbm90
aWNlZCB0aGlzIHdoZW4gd29ya2luZyBvbiBCdWcgIzU2NjgwLgogICAgICBXZSBjYW4gcGFzcyBy
ZXN1bHRfcmVjIHRvIHJvd19zZWxfc3RvcmVfcm93X2lkX3RvX3ByZWJ1aWx0KCksCiAgICAgIGp1
c3QgbGlrZSB3ZSBwYXNzIGl0IHRvIHJvd19zZWxfc3RvcmVfbXlzcWxfcmVjKCkuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwogMzI3MiBKaW1teSBZ
YW5nCTIwMTAtMTAtMjEKICAgICAgTW92ZSBNT05JVE9SX1RBQkxFX0NMT1NFIGZyb20gZGljdF90
YWJsZV9jbG9zZSgpIHRvIGhhX2lubm9iYXNlOjpjbG9zZSgpLgogICAgICBUaGlzIGlzIHRvIGtl
ZXAgdGhlIGNvdW50ZXIgY291bnRpbmcgbnVtYmVyIE15U1FMIGNsb3NlIHJlcXVlc3QsIHdoaWxl
CiAgICAgIGRpY3Rpb25hcnkgTFJVIGNoYW5nZSBoYXMgY2hhbmdlZCB0aGUgdXNhZ2UgZGljdF90
YWJsZV9jbG9zZSgpIGZvciBJbm5vREIKICAgICAgdGFibGUgb3BlbiBhbmQgY2xvc2UgY291bnRz
LiBUaGlzIGtlZXBzIHRoZSBpbm5vZGJfbW9uaXRvci50ZXN0IHJlc3VsdAogICAgICB0byBiZSBj
b25zaXN0ZW50IHdpdGggaXRzIGV4aXN0aW5nIG9uZXMuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0
b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGRpY3QuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2hh
bmRsZXIvaGFfaW5ub2RiLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jv
dy9yb3cwc2VsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwlyZXZpZDpq
aW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDEwMjEwODQ4MjgtbnE2c2RyczNqcWZsdGFvNQorKysg
Yi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMDEwMjEwOTAyMjgtdnB3YnBucWMyYW8yNGhoZwpAQCAtNDQ2OCwxMyArNDQ2OCwx
MCBAQCByZXF1aXJlc19jbHVzdF9yZWM6CiAJCX0KIAogCQlpZiAocHJlYnVpbHQtPmNsdXN0X2lu
ZGV4X3dhc19nZW5lcmF0ZWQpIHsKLQkJCWlmIChyZXN1bHRfcmVjICE9IHJlYykgewotCQkJCW9m
ZnNldHMgPSByZWNfZ2V0X29mZnNldHMoCi0JCQkJCXJlYywgaW5kZXgsIG9mZnNldHMsIFVMSU5U
X1VOREVGSU5FRCwKLQkJCQkJJmhlYXApOwotCQkJfQotCQkJcm93X3NlbF9zdG9yZV9yb3dfaWRf
dG9fcHJlYnVpbHQocHJlYnVpbHQsIHJlYywKLQkJCQkJCQkgaW5kZXgsIG9mZnNldHMpOworCQkJ
cm93X3NlbF9zdG9yZV9yb3dfaWRfdG9fcHJlYnVpbHQoCisJCQkJcHJlYnVpbHQsIHJlc3VsdF9y
ZWMsCisJCQkJcmVzdWx0X3JlYyA9PSByZWMgPyBpbmRleCA6IGNsdXN0X2luZGV4LAorCQkJCW9m
ZnNldHMpOwogCQl9CiAJfQogCgo=

--===============0234316155==
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 13:34:03 +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


--===============0234316155==--