From: marko.makela
Date: June 22 2010 10:42am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3111)
List-Archive: http://lists.mysql.com/commits/111775
Message-Id: <201006221043.o5MAhSdO031396@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0507497605=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDppbmFhbS5yYW5hQG9yYWNsZS5jb20tMjAxMDA2MjExNTUyMDktMXB1N253
cTA1eDd0YmZvbwoKIDMxMTEgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0yMgogICAgICBkaWN0X2xv
YWRfY29sdW1uX2xvdygpOiBJbml0aWFsaXplIHBvcy4gSW1wcm92ZSBkb2N1bWVudGF0aW9uLgog
ICAgICBBcHByb3ZlZCBieSBKaW1teSBZYW5nLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdl
L2lubm9iYXNlL2RpY3QvZGljdDBsb2FkLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L2RpY3QwbG9hZC5oCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2RpY3QvZGlj
dDBsb2FkLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuYwlyZXZpZDpp
bmFhbS5yYW5hQG9yYWNsZS5jb20tMjAxMDA2MjExNTUyMDktMXB1N253cTA1eDd0YmZvbworKysg
Yi9zdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBsb2FkLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDA2MjIxMDQyMzktMGxwYnU3MHVzNTBqYXFmcwpAQCAtNzgyLDEyICs3ODIs
MTMgQEAgY29uc3QgY2hhcioKIGRpY3RfbG9hZF9jb2x1bW5fbG93KAogLyo9PT09PT09PT09PT09
PT09PSovCiAJZGljdF90YWJsZV90Kgl0YWJsZSwJCS8qITwgaW4vb3V0OiB0YWJsZSwgY291bGQg
YmUgTlVMTAotCQkJCQlpZiB3ZSBqdXN0IHBvbHVsYXRlIGEgZGljdF9jb2x1bW5fdAorCQkJCQlp
ZiB3ZSBqdXN0IHBvcHVsYXRlIGEgZGljdF9jb2x1bW5fdAogCQkJCQlzdHJ1Y3Qgd2l0aCBpbmZv
cm1hdGlvbiBmcm9tCiAJCQkJCWEgU1lTX0NPTFVNTlMgcmVjb3JkICovCiAJbWVtX2hlYXBfdCoJ
aGVhcCwJCS8qITwgaW4vb3V0OiBtZW1vcnkgaGVhcAogCQkJCQlmb3IgdGVtcG9yYXJ5IHN0b3Jh
Z2UgKi8KLQlkaWN0X2NvbF90Kgljb2x1bW4sCQkvKiE8IG91dDogZGljdF9jb2x1bW5fdCB0byBm
aWxsICovCisJZGljdF9jb2xfdCoJY29sdW1uLAkJLyohPCBvdXQ6IGRpY3RfY29sdW1uX3QgdG8g
ZmlsbCwKKwkJCQkJb3IgTlVMTCBpZiB0YWJsZSAhPSBOVUxMICovCiAJZHVsaW50KgkJdGFibGVf
aWQsCS8qITwgb3V0OiB0YWJsZSBpZCAqLwogCWNvbnN0IGNoYXIqKgljb2xfbmFtZSwJLyohPCBv
dXQ6IGNvbHVtbiBuYW1lICovCiAJY29uc3QgcmVjX3QqCXJlYykJCS8qITwgaW46IFNZU19DT0xV
TU5TIHJlY29yZCAqLwpAQCAtODAwLDYgKzgwMSw4IEBAIGRpY3RfbG9hZF9jb2x1bW5fbG93KAog
CXVsaW50CQljb2xfbGVuOwogCXVsaW50CQlwb3M7CiAKKwl1dF9hZCh0YWJsZSB8fCBjb2x1bW4p
OworCiAJaWYgKFVOSVZfVU5MSUtFTFkocmVjX2dldF9kZWxldGVkX2ZsYWcocmVjLCAwKSkpIHsK
IAkJcmV0dXJuKCJkZWxldGUtbWFya2VkIHJlY29yZCBpbiBTWVNfQ09MVU1OUyIpOwogCX0KQEAg
LTgyNyw5ICs4MzAsOSBAQCBlcnJfbGVuOgogCQlnb3RvIGVycl9sZW47CiAJfQogCi0JaWYgKCF0
YWJsZSkgewotCQlwb3MgPSBtYWNoX3JlYWRfZnJvbV80KGZpZWxkKTsKLQl9IGVsc2UgaWYgKFVO
SVZfVU5MSUtFTFkodGFibGUtPm5fZGVmICE9IG1hY2hfcmVhZF9mcm9tXzQoZmllbGQpKSkgewor
CXBvcyA9IG1hY2hfcmVhZF9mcm9tXzQoZmllbGQpOworCisJaWYgKFVOSVZfVU5MSUtFTFkodGFi
bGUgJiYgdGFibGUtPm5fZGVmICE9IHBvcykpIHsKIAkJcmV0dXJuKCJTWVNfQ09MVU1OUy5QT1Mg
bWlzbWF0Y2giKTsKIAl9CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvZGljdDBsb2FkLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGxv
YWQuaAlyZXZpZDppbmFhbS5yYW5hQG9yYWNsZS5jb20tMjAxMDA2MjExNTUyMDktMXB1N253cTA1
eDd0YmZvbworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBsb2FkLmgJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjIxMDQyMzktMGxwYnU3MHVzNTBqYXFmcwpA
QCAtMTA5LDcgKzEwOSw4IEBAIGRpY3RfbG9hZF9jb2x1bW5fbG93KAogCQkJCQlhIFNZU19DT0xV
TU5TIHJlY29yZCAqLwogCW1lbV9oZWFwX3QqCWhlYXAsCQkvKiE8IGluL291dDogbWVtb3J5IGhl
YXAKIAkJCQkJZm9yIHRlbXBvcmFyeSBzdG9yYWdlICovCi0JZGljdF9jb2xfdCoJY29sdW1uLAkJ
LyohPCBvdXQ6IGRpY3RfY29sdW1uX3QgdG8gZmlsbCAqLworCWRpY3RfY29sX3QqCWNvbHVtbiwJ
CS8qITwgb3V0OiBkaWN0X2NvbHVtbl90IHRvIGZpbGwsCisJCQkJCW9yIE5VTEwgaWYgdGFibGUg
IT0gTlVMTCAqLwogCWR1bGludCoJCXRhYmxlX2lkLAkvKiE8IG91dDogdGFibGUgaWQgKi8KIAlj
b25zdCBjaGFyKioJY29sX25hbWUsCS8qITwgb3V0OiBjb2x1bW4gbmFtZSAqLwogCWNvbnN0IHJl
Y190KglyZWMpOwkJLyohPCBpbjogU1lTX0NPTFVNTlMgcmVjb3JkICovCgo=

--===============0507497605==
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.5-innodb/
# testament_sha1: 8b0211bdc0b74a0679b5f6b4c602dc83b74e5b25
# timestamp: 2010-06-22 13:42:45 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: inaam.rana@stripped\
#   1pu7nwq05x7tbfoo
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd+2RCEAAn7flCAwc3f//3M/
AyC////8BAAIAFAFDJ46VHUxwJ3d22vCSJBMJNMnk0aGRNNJ5TIZNGgPUPUDQCSSZMRplMk9J6oy
AAAAaNGgAAJFAp6qfqm8mSniT1HqaaZqB6QA0aYQwE/VBzAEYJiAYBME0ZDQwCYIxMJJIyaTBNMp
PNNJqep6JhMnoygNAA0PUMCdUDlBBHPEYyGR7SOGrob7M8vlx5Hh79WmlaLtWm7CksIV8G/OyWey
kpz+5+G5fA3jAyjbG0frlDVLIy6F81h6YxcJOhFwYUbx3dPr7/JtOsjo58eepJVP5k8ZWdmY9RS5
ZFHBWnocIyGyPediv0X9TNNLozkcnMBBhVKUlHWKjyaluNV2Onui24TgTED7mUXADoZfhC5CcV9g
o0dGHlmfbpkhasgl+HLq2iLFrN5QchVXQVSgmYualyFm60LYKSBLmkf2jkHSPS8VBC0biMVFyY2I
ZTyj6SL/aLADETgIAZaGUKHFjSWN0UIXhunMDkz7vXM3xiRoUZyyjKgnwlz1rfwhv43S14Bgdgbx
rriHgLuqO2UyDC0GUdfn03MsyeQ3yoWD4KFgF6GYCWvECebTIPYiMTiyyIw6WGbwEVajNeUNMrVp
CD+k7VjhCF0xQeUQS0VBXYk9I5Xy/DG9lUInB05iOKxrSvUxDM8lWfQLIWkSEkabS/l5gK/nBcXV
XLQ2tZQmtb7qlhbZ8lSOHEUFWadZ+Q+xhpe8KsgicMliKG7MKikWTZLD9AXXZ5sK/YpIUL671KY5
FmL06tQutEqv4o5jZsLHE2Fgb9CRkJC1aXllfnMLcALlIUIuzxDljSQs9tKssNwy83cJ7YhubVtj
SjtFGo96vcDSaCmiU2mLE+RzrRAbuy3g7Rm0jr2Hv13ix1oV1jbY2+mHbQRy9+ZdsQj/Qrw0iMJB
ycVazvx3Voa0whe3FohD88TiEi5yeBtgJxiJjcbCaKZAy6siOuzh3CV/vSpIdmaCIiOBsVRS8Phv
AfWlxnBWtHvrFu3Md/n5SUWkddOq0c9gGv1dQhiesTdszq5d4slRsFq23coni7qycnPC6m9mYSdf
PpMvxHDKJV4Elt66ijWwpLC3VcVldMDIEgNWRInKzFadwrFKVS4hfxFzDWGZVXrDDE+Va+9zTve5
MgJOaN9PHWYDcPE1DPMSI8TaUnn26+e3rN2SbI19GLZufpbs/LnyEaG6FnyJwy0224dU8xgRgrlR
FTIE4vMG/gPbusE1l6mXfyOw6g0ypzdw4gPHQJ3s6VtWgWWSkC2GdYCbMku3mQ1UnDGeUqjAecX1
r0rmRlon0aJn3UMHMi3Z2SjfbWBDLhETYiPHQjBI1UGIVIc4PQMI722LzDFIk4KRi+FoshgMIrBL
BkKaY3ZCNeg9CYdtopFX7jjxc9Kc1yUm1RHucAopK0hACTht3q2CnqebMlBg1wW3ZeMIsS2TQq51
Qkh2nF2zqI7es5CWFGKRRwTLJyFU5ZwkzvwYYHgSKaWPW45OMZoYKPBYgOGtUEg31s4ZpWbLlkrS
iRFZ9ErVScxNTG0xl4EN3ukjpDZOaUMYC9iWdpRR4aHLkxncUpGzogN9wtOwaL9qjCmAapbsuuwl
gUIoCUT3BDOB5FdQnrxwSwCn3gWYi5lhViM0J8cWiRP4pkY7uZTFdQC6PwH/MfLkLuSKcKEhv2yI
Qg==


--===============0507497605==--