From: marko.makela
Date: June 22 2010 10:43am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3110 to 3112)
List-Archive: http://lists.mysql.com/commits/111752
Message-Id: <201006221043.o5MA25PE021925@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1126615738=="

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

IDMxMTIgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0yMgogICAgICBidWZfZmx1c2hfaW5zZXJ0X2lu
X2ZsdXNoX3JidCgpLCBidWZfZmx1c2hfdmFsaWRhdGVfbG93KCk6CiAgICAgIFNpbGVuY2UgR0ND
IHdhcm5pbmdzIGFib3V0IGRlcmVmZXJlbmNpbmcgYSB0eXBlLXB1bm5lZCBwb2ludGVyLgogICAg
ICBBcHByb3ZlZCBieSBKaW1teSBZYW5nLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lu
bm9iYXNlL2J1Zi9idWYwZmx1LmMKIDMxMTEgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0yMgogICAg
ICBkaWN0X2xvYWRfY29sdW1uX2xvdygpOiBJbml0aWFsaXplIHBvcy4gSW1wcm92ZSBkb2N1bWVu
dGF0aW9uLgogICAgICBBcHByb3ZlZCBieSBKaW1teSBZYW5nLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBsb2FkLmMKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL2RpY3QwbG9hZC5oCiAzMTEwIEluYWFtIFJhbmEJMjAxMC0wNi0yMQogICAgICBG
aXhlcyBidWcjMzkxNjguCiAgICAgIE1ha2UgYSBjYWxsIHRvIGxvZ19mcmVlX2NoZWNrKCkgb24g
YWxsIERNTCBwYXRocy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL2xvZzBsb2cuaWMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGlucy5jCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBwdXJnZS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzB1aW5zLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVtb2QuYwogICAg
ICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdXBkLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2Jhc2UvYnVmL2J1ZjBmbHUuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVm
MGZsdS5jCXJldmlkOmluYWFtLnJhbmFAb3JhY2xlLmNvbS0yMDEwMDYyMTE1NTIwOS0xcHU3bndx
MDV4N3RiZm9vCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBmbHUuYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMjEwNDMxNy01eGwzc3V3cDFocWp0ZDgwCkBAIC0x
MTQsNyArMTE0LDkgQEAgYnVmX2ZsdXNoX2luc2VydF9pbl9mbHVzaF9yYnQoCiAJcF9ub2RlID0g
cmJ0X3ByZXYoYnVmX3Bvb2wtPmZsdXNoX3JidCwgY19ub2RlKTsKIAogCWlmIChwX25vZGUgIT0g
TlVMTCkgewotCQlwcmV2ID0gKnJidF92YWx1ZShidWZfcGFnZV90KiwgcF9ub2RlKTsKKwkJYnVm
X3BhZ2VfdCoqCXZhbHVlOworCQl2YWx1ZSA9IHJidF92YWx1ZShidWZfcGFnZV90KiwgcF9ub2Rl
KTsKKwkJcHJldiA9ICp2YWx1ZTsKIAkJdXRfYShwcmV2ICE9IE5VTEwpOwogCX0KIApAQCAtMjA4
OCwxMyArMjA5MCwxMyBAQCBidWZfZmx1c2hfdmFsaWRhdGVfbG93KAogCQl1dF9hKG9tID4gMCk7
CiAKIAkJaWYgKFVOSVZfTElLRUxZX05VTEwoYnVmX3Bvb2wtPmZsdXNoX3JidCkpIHsKLQkJCWJ1
Zl9wYWdlX3QqIHJwYWdlOworCQkJYnVmX3BhZ2VfdCoqIHBycGFnZTsKIAogCQkJdXRfYShybm9k
ZSk7Ci0JCQlycGFnZSA9ICpyYnRfdmFsdWUoYnVmX3BhZ2VfdCosIHJub2RlKTsKKwkJCXBycGFn
ZSA9IHJidF92YWx1ZShidWZfcGFnZV90Kiwgcm5vZGUpOwogCi0JCQl1dF9hKHJwYWdlKTsKLQkJ
CXV0X2EocnBhZ2UgPT0gYnBhZ2UpOworCQkJdXRfYSgqcHJwYWdlKTsKKwkJCXV0X2EoKnBycGFn
ZSA9PSBicGFnZSk7CiAJCQlybm9kZSA9IHJidF9uZXh0KGJ1Zl9wb29sLT5mbHVzaF9yYnQsIHJu
b2RlKTsKIAkJfQogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2Rp
Y3QwbG9hZC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBsb2FkLmMJcmV2aWQ6
aW5hYW0ucmFuYUBvcmFjbGUuY29tLTIwMTAwNjIxMTU1MjA5LTFwdTdud3EwNXg3dGJmb28KKysr
IGIvc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwbG9hZC5jCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTAwNjIyMTA0MzE3LTV4bDNzdXdwMWhxanRkODAKQEAgLTc4MiwxMiArNzgy
LDEzIEBAIGNvbnN0IGNoYXIqCiBkaWN0X2xvYWRfY29sdW1uX2xvdygKIC8qPT09PT09PT09PT09
PT09PT0qLwogCWRpY3RfdGFibGVfdCoJdGFibGUsCQkvKiE8IGluL291dDogdGFibGUsIGNvdWxk
IGJlIE5VTEwKLQkJCQkJaWYgd2UganVzdCBwb2x1bGF0ZSBhIGRpY3RfY29sdW1uX3QKKwkJCQkJ
aWYgd2UganVzdCBwb3B1bGF0ZSBhIGRpY3RfY29sdW1uX3QKIAkJCQkJc3RydWN0IHdpdGggaW5m
b3JtYXRpb24gZnJvbQogCQkJCQlhIFNZU19DT0xVTU5TIHJlY29yZCAqLwogCW1lbV9oZWFwX3Qq
CWhlYXAsCQkvKiE8IGluL291dDogbWVtb3J5IGhlYXAKIAkJCQkJZm9yIHRlbXBvcmFyeSBzdG9y
YWdlICovCi0JZGljdF9jb2xfdCoJY29sdW1uLAkJLyohPCBvdXQ6IGRpY3RfY29sdW1uX3QgdG8g
ZmlsbCAqLworCWRpY3RfY29sX3QqCWNvbHVtbiwJCS8qITwgb3V0OiBkaWN0X2NvbHVtbl90IHRv
IGZpbGwsCisJCQkJCW9yIE5VTEwgaWYgdGFibGUgIT0gTlVMTCAqLwogCWR1bGludCoJCXRhYmxl
X2lkLAkvKiE8IG91dDogdGFibGUgaWQgKi8KIAljb25zdCBjaGFyKioJY29sX25hbWUsCS8qITwg
b3V0OiBjb2x1bW4gbmFtZSAqLwogCWNvbnN0IHJlY190KglyZWMpCQkvKiE8IGluOiBTWVNfQ09M
VU1OUyByZWNvcmQgKi8KQEAgLTgwMCw2ICs4MDEsOCBAQCBkaWN0X2xvYWRfY29sdW1uX2xvdygK
IAl1bGludAkJY29sX2xlbjsKIAl1bGludAkJcG9zOwogCisJdXRfYWQodGFibGUgfHwgY29sdW1u
KTsKKwogCWlmIChVTklWX1VOTElLRUxZKHJlY19nZXRfZGVsZXRlZF9mbGFnKHJlYywgMCkpKSB7
CiAJCXJldHVybigiZGVsZXRlLW1hcmtlZCByZWNvcmQgaW4gU1lTX0NPTFVNTlMiKTsKIAl9CkBA
IC04MjcsOSArODMwLDkgQEAgZXJyX2xlbjoKIAkJZ290byBlcnJfbGVuOwogCX0KIAotCWlmICgh
dGFibGUpIHsKLQkJcG9zID0gbWFjaF9yZWFkX2Zyb21fNChmaWVsZCk7Ci0JfSBlbHNlIGlmIChV
TklWX1VOTElLRUxZKHRhYmxlLT5uX2RlZiAhPSBtYWNoX3JlYWRfZnJvbV80KGZpZWxkKSkpIHsK
Kwlwb3MgPSBtYWNoX3JlYWRfZnJvbV80KGZpZWxkKTsKKworCWlmIChVTklWX1VOTElLRUxZKHRh
YmxlICYmIHRhYmxlLT5uX2RlZiAhPSBwb3MpKSB7CiAJCXJldHVybigiU1lTX0NPTFVNTlMuUE9T
IG1pc21hdGNoIik7CiAJfQogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9p
bmNsdWRlL2RpY3QwbG9hZC5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBs
b2FkLmgJcmV2aWQ6aW5hYW0ucmFuYUBvcmFjbGUuY29tLTIwMTAwNjIxMTU1MjA5LTFwdTdud3Ew
NXg3dGJmb28KKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwbG9hZC5oCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjIyMTA0MzE3LTV4bDNzdXdwMWhxanRkODAK
QEAgLTEwOSw3ICsxMDksOCBAQCBkaWN0X2xvYWRfY29sdW1uX2xvdygKIAkJCQkJYSBTWVNfQ09M
VU1OUyByZWNvcmQgKi8KIAltZW1faGVhcF90KgloZWFwLAkJLyohPCBpbi9vdXQ6IG1lbW9yeSBo
ZWFwCiAJCQkJCWZvciB0ZW1wb3Jhcnkgc3RvcmFnZSAqLwotCWRpY3RfY29sX3QqCWNvbHVtbiwJ
CS8qITwgb3V0OiBkaWN0X2NvbHVtbl90IHRvIGZpbGwgKi8KKwlkaWN0X2NvbF90Kgljb2x1bW4s
CQkvKiE8IG91dDogZGljdF9jb2x1bW5fdCB0byBmaWxsLAorCQkJCQlvciBOVUxMIGlmIHRhYmxl
ICE9IE5VTEwgKi8KIAlkdWxpbnQqCQl0YWJsZV9pZCwJLyohPCBvdXQ6IHRhYmxlIGlkICovCiAJ
Y29uc3QgY2hhcioqCWNvbF9uYW1lLAkvKiE8IG91dDogY29sdW1uIG5hbWUgKi8KIAljb25zdCBy
ZWNfdCoJcmVjKTsJCS8qITwgaW46IFNZU19DT0xVTU5TIHJlY29yZCAqLwoK

--===============1126615738==
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: 42637d2aac6c210255d21bb6e413f6c9e38d0b1c
# timestamp: 2010-06-22 13:43:48 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: inaam.rana@stripped\
#   1pu7nwq05x7tbfoo
# 
# Begin bundle
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
0awr+A==


--===============1126615738==--