From: marko.makela
Date: June 1 2010 12:08pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3488 to 3490)
List-Archive: http://lists.mysql.com/commits/109723
Message-Id: <201006011208.o51C8JHu028998@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0845978474=="

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

IDM0OTAgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wMQogICAgICBNaW5vciBjbGVhbnVwLgogICAg
ICAKICAgICAgbG9ja19yZWNfdW5sb2NrKCk6IENhY2hlIGZpcnN0X2xvY2sgYW5kIHJld3JpdGUg
d2hpbGUoKSBsb29wcyBhcyBmb3IoKS4KICAgICAgCiAgICAgIGJ0cl9jdXJfb3B0aW1pc3RpY191
cGRhdGUoKTogVXNlIGNvbW1vbiBlcnJvciBoYW5kbGluZyByZXR1cm4uCiAgICAgIAogICAgICBy
b3dfY3JlYXRlX3ByZWJ1aWx0KCk6IEFkZCBWYWxncmluZCBpbnN0cnVtZW50YXRpb24uCgogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1ci5jCiAgICAg
IHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9sb2NrL2xvY2swbG9jay5jCiAgICAgIHN0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9yb3cvcm93MG15c3FsLmMKIDM0ODkgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0w
MQogICAgICBEb2N1bWVudCB0aGUgQnVnICM1MzgxMiBmaXguCgogICAgbW9kaWZpZWQ6CiAgICAg
IHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKIDM0ODggTWFya28gTcOka2Vsw6QJMjAx
MC0wNi0wMQogICAgICBCdWcjNTM4MTI6IGFzc2VydCByb3cvcm93MHVtb2QuYyBsaW5lIDY2MCBp
biB0eG4gcm9sbGJhY2sgYWZ0ZXIgY3Jhc2ggcmVjb3ZlcnkKICAgICAgCiAgICAgIHJvd191bmRv
X21vZF91cGRfZXhpc3Rfc2VjKCk6IFRvbGVyYXRlIGEgZmFpbHVyZSB0byBidWlsZCB0aGUgaW5k
ZXggZW50cnkKICAgICAgZm9yIGEgRFlOQU1JQyBvciBDT01QUkVTU0VEIHRhYmxlIGR1cmluZyBj
cmFzaCByZWNvdmVyeS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L3Jvdy9yb3cwdW1vZC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4v
Q2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTAzNzM4LXVwbThhd2FoZXNtZWg5ZHIKKysr
IGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEwMDYwMTEyMDc1MS0xdXE3YmJ0YTVuN3RzMHFyCkBAIC0xLDMgKzEsOSBAQAor
MjAxMC0wNi0wMQlUaGUgSW5ub0RCIFRlYW0KKworCSogcm93L3JvdzB1bW9kLmM6CisJRml4IEJ1
ZyM1MzgxMiBhc3NlcnQgcm93L3JvdzB1bW9kLmMgbGluZSA2NjAgaW4gdHhuIHJvbGxiYWNrCisJ
YWZ0ZXIgY3Jhc2ggcmVjb3ZlcnkKKwogMjAxMC0wNS0yNQlUaGUgSW5ub0RCIFRlYW0KIAogCSog
aGFuZGxlci9oYV9pbm5vZGIuY2MsIGluY2x1ZGUvcm93MG15c3FsLmgsIHJvdy9yb3cwbXlzcWwu
YzoKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBjdXIu
YycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDExMDM3MzgtdXBtOGF3YWhlc21laDlkcgorKysgYi9z
dG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBjdXIuYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEwMDYwMTEyMDc1MS0xdXE3YmJ0YTVuN3RzMHFyCkBAIC0xOTU5LDkgKzE5NTks
OCBAQCBhbnlfZXh0ZXJuOgogCWVyciA9IGJ0cl9jdXJfdXBkX2xvY2tfYW5kX3VuZG8oZmxhZ3Ms
IGN1cnNvciwgdXBkYXRlLCBjbXBsX2luZm8sCiAJCQkJCXRociwgbXRyLCAmcm9sbF9wdHIpOwog
CWlmIChlcnIgIT0gREJfU1VDQ0VTUykgewotZXJyX2V4aXQ6Ci0JCW1lbV9oZWFwX2ZyZWUoaGVh
cCk7Ci0JCXJldHVybihlcnIpOworCisJCWdvdG8gZXJyX2V4aXQ7CiAJfQogCiAJLyogT2ssIHdl
IG1heSBkbyB0aGUgcmVwbGFjZW1lbnQuIFN0b3JlIG9uIHRoZSBwYWdlIGluZmltdW0gdGhlCkBA
IC0yMDA3LDkgKzIwMDYsMTAgQEAgZXJyX2V4aXQ6CiAKIAlwYWdlX2N1cl9tb3ZlX3RvX25leHQo
cGFnZV9jdXJzb3IpOwogCisJZXJyID0gREJfU1VDQ0VTUzsKK2Vycl9leGl0OgogCW1lbV9oZWFw
X2ZyZWUoaGVhcCk7Ci0KLQlyZXR1cm4oREJfU1VDQ0VTUyk7CisJcmV0dXJuKGVycik7CiB9CiAK
IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqLy8qKgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9sb2Nr
L2xvY2swbG9jay5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vbG9jay9sb2NrMGxvY2su
YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTEwMzczOC11cG04YXdhaGVz
bWVoOWRyCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9sb2NrL2xvY2swbG9jay5jCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTIwNzUxLTF1cTdiYnRhNW43dHMwcXIK
QEAgLTM5MzUsOCArMzkzNSw4IEBAIGxvY2tfcmVjX3VubG9jaygKIAljb25zdCByZWNfdCoJCXJl
YywJLyohPCBpbjogcmVjb3JkICovCiAJZW51bSBsb2NrX21vZGUJCWxvY2tfbW9kZSkvKiE8IGlu
OiBMT0NLX1Mgb3IgTE9DS19YICovCiB7CisJbG9ja190KglmaXJzdF9sb2NrOwogCWxvY2tfdCoJ
bG9jazsKLQlsb2NrX3QqCXJlbGVhc2VfbG9jawk9IE5VTEw7CiAJdWxpbnQJaGVhcF9ubzsKIAog
CXV0X2FkKHRyeCAmJiByZWMpOwpAQCAtMzk0Niw0OCArMzk0Niw0MCBAQCBsb2NrX3JlY191bmxv
Y2soCiAKIAltdXRleF9lbnRlcigma2VybmVsX211dGV4KTsKIAotCWxvY2sgPSBsb2NrX3JlY19n
ZXRfZmlyc3QoYmxvY2ssIGhlYXBfbm8pOworCWZpcnN0X2xvY2sgPSBsb2NrX3JlY19nZXRfZmly
c3QoYmxvY2ssIGhlYXBfbm8pOwogCiAJLyogRmluZCB0aGUgbGFzdCBsb2NrIHdpdGggdGhlIHNh
bWUgbG9ja19tb2RlIGFuZCB0cmFuc2FjdGlvbgogCWZyb20gdGhlIHJlY29yZC4gKi8KIAotCXdo
aWxlIChsb2NrICE9IE5VTEwpIHsKKwlmb3IgKGxvY2sgPSBmaXJzdF9sb2NrOyBsb2NrICE9IE5V
TEw7CisJICAgICBsb2NrID0gbG9ja19yZWNfZ2V0X25leHQoaGVhcF9ubywgbG9jaykpIHsKIAkJ
aWYgKGxvY2stPnRyeCA9PSB0cnggJiYgbG9ja19nZXRfbW9kZShsb2NrKSA9PSBsb2NrX21vZGUp
IHsKLQkJCXJlbGVhc2VfbG9jayA9IGxvY2s7CiAJCQl1dF9hKCFsb2NrX2dldF93YWl0KGxvY2sp
KTsKKwkJCWxvY2tfcmVjX3Jlc2V0X250aF9iaXQobG9jaywgaGVhcF9ubyk7CisJCQlnb3RvIHJl
bGVhc2VkOwogCQl9Ci0KLQkJbG9jayA9IGxvY2tfcmVjX2dldF9uZXh0KGhlYXBfbm8sIGxvY2sp
OwogCX0KIAotCS8qIElmIGEgcmVjb3JkIGxvY2sgaXMgZm91bmQsIHJlbGVhc2UgdGhlIHJlY29y
ZCBsb2NrICovCi0KLQlpZiAoVU5JVl9MSUtFTFkocmVsZWFzZV9sb2NrICE9IE5VTEwpKSB7Ci0J
CWxvY2tfcmVjX3Jlc2V0X250aF9iaXQocmVsZWFzZV9sb2NrLCBoZWFwX25vKTsKLQl9IGVsc2Ug
ewotCQltdXRleF9leGl0KCZrZXJuZWxfbXV0ZXgpOwotCQl1dF9wcmludF90aW1lc3RhbXAoc3Rk
ZXJyKTsKLQkJZnByaW50ZihzdGRlcnIsCi0JCQkiICBJbm5vREI6IEVycm9yOiB1bmxvY2sgcm93
IGNvdWxkIG5vdCIKLQkJCSIgZmluZCBhICVsdSBtb2RlIGxvY2sgb24gdGhlIHJlY29yZFxuIiwK
LQkJCSh1bG9uZykgbG9ja19tb2RlKTsKKwltdXRleF9leGl0KCZrZXJuZWxfbXV0ZXgpOworCXV0
X3ByaW50X3RpbWVzdGFtcChzdGRlcnIpOworCWZwcmludGYoc3RkZXJyLAorCQkiICBJbm5vREI6
IEVycm9yOiB1bmxvY2sgcm93IGNvdWxkIG5vdCIKKwkJIiBmaW5kIGEgJWx1IG1vZGUgbG9jayBv
biB0aGUgcmVjb3JkXG4iLAorCQkodWxvbmcpIGxvY2tfbW9kZSk7CiAKLQkJcmV0dXJuOwotCX0K
KwlyZXR1cm47CiAKK3JlbGVhc2VkOgogCS8qIENoZWNrIGlmIHdlIGNhbiBub3cgZ3JhbnQgd2Fp
dGluZyBsb2NrIHJlcXVlc3RzICovCiAKLQlsb2NrID0gbG9ja19yZWNfZ2V0X2ZpcnN0KGJsb2Nr
LCBoZWFwX25vKTsKLQotCXdoaWxlIChsb2NrICE9IE5VTEwpIHsKKwlmb3IgKGxvY2sgPSBmaXJz
dF9sb2NrOyBsb2NrICE9IE5VTEw7CisJICAgICBsb2NrID0gbG9ja19yZWNfZ2V0X25leHQoaGVh
cF9ubywgbG9jaykpIHsKIAkJaWYgKGxvY2tfZ2V0X3dhaXQobG9jaykKIAkJICAgICYmICFsb2Nr
X3JlY19oYXNfdG9fd2FpdF9pbl9xdWV1ZShsb2NrKSkgewogCiAJCQkvKiBHcmFudCB0aGUgbG9j
ayAqLwogCQkJbG9ja19ncmFudChsb2NrKTsKIAkJfQotCi0JCWxvY2sgPSBsb2NrX3JlY19nZXRf
bmV4dChoZWFwX25vLCBsb2NrKTsKIAl9CiAKIAltdXRleF9leGl0KCZrZXJuZWxfbXV0ZXgpOwoK
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MG15c3FsLmMn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MG15c3FsLmMJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDExMDM3MzgtdXBtOGF3YWhlc21laDlkcgorKysgYi9z
dG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBteXNxbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTAwNjAxMTIwNzUxLTF1cTdiYnRhNW43dHMwcXIKQEAgLTYyNSw2ICs2MjUs
OCBAQCByb3dfY3JlYXRlX3ByZWJ1aWx0KAogCiAJcHJlYnVpbHQtPnNlbGVjdF9sb2NrX3R5cGUg
PSBMT0NLX05PTkU7CiAJcHJlYnVpbHQtPnN0b3JlZF9zZWxlY3RfbG9ja190eXBlID0gOTk5OTk5
OTk7CisJVU5JVl9NRU1fSU5WQUxJRCgmcHJlYnVpbHQtPnN0b3JlZF9zZWxlY3RfbG9ja190eXBl
LAorCQkJIHNpemVvZiBwcmVidWlsdC0+c3RvcmVkX3NlbGVjdF9sb2NrX3R5cGUpOwogCiAJcHJl
YnVpbHQtPnNlYXJjaF90dXBsZSA9IGR0dXBsZV9jcmVhdGUoCiAJCWhlYXAsIDIgKiBkaWN0X3Rh
YmxlX2dldF9uX2NvbHModGFibGUpKTsKCg==

--===============0845978474==
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.1-innodb/
# testament_sha1: 26f7d8de06c1423fa33c8636c674872251fcd58a
# timestamp: 2010-06-01 15:08:37 +0300
# base_revision_id: marko.makela@stripped\
#   upm8awahesmeh9dr
# 
# Begin bundle
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
/i7kinChICfaUmQ=


--===============0845978474==--