From: marko.makela
Date: June 1 2010 12:09pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3131)
List-Archive: http://lists.mysql.com/commits/109725
Message-Id: <201006011209.o51BFJ86014442@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1601473552=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTEyMDUwMS1ydzY2
N28zdXA3aGg3NTBwCgogMzEzMSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTAxCiAgICAgIE1lcmdl
IGEgY2hhbmdlIGZyb20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgCiAgICAgICAgLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAg
ICAgcmV2bm86IDM0OTAKICAgICAgICByZXZpc2lvbi1pZDogbWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDA2MDExMjA3NTEtMXVxN2JidGE1bjd0czBxcgogICAgICAgIHBhcmVudDogbWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDExMjA1MjEtcTQ4aGswNW5lNGoxczJvMAogICAgICAg
IGNvbW1pdHRlcjogTWFya28gTcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAg
ICAgIGJyYW5jaCBuaWNrOiA1LjEtaW5ub2RiCiAgICAgICAgdGltZXN0YW1wOiBUdWUgMjAxMC0w
Ni0wMSAxNTowNzo1MSArMDMwMAogICAgICAgIG1lc3NhZ2U6CiAgICAgICAgICBNaW5vciBjbGVh
bnVwLgogICAgICAKICAgICAgICAgIGxvY2tfcmVjX3VubG9jaygpOiBDYWNoZSBmaXJzdF9sb2Nr
IGFuZCByZXdyaXRlIHdoaWxlKCkgbG9vcHMgYXMgZm9yKCkuCiAgICAgIAogICAgICAgICAgYnRy
X2N1cl9vcHRpbWlzdGljX3VwZGF0ZSgpOiBVc2UgY29tbW9uIGVycm9yIGhhbmRsaW5nIHJldHVy
bi4KICAgICAgCiAgICAgICAgICByb3dfY3JlYXRlX3ByZWJ1aWx0KCk6IEFkZCBWYWxncmluZCBp
bnN0cnVtZW50YXRpb24uCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRy
L2J0cjBjdXIuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG15c3FsLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRy
MGN1ci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTIwNTAxLXJ3NjY3
bzN1cDdoaDc1MHAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTIwOTMzLXI4Zm5oaWc1bTVxbm5vaHoKQEAg
LTIwNzksOSArMjA3OSw4IEBAIGFueV9leHRlcm46CiAJZXJyID0gYnRyX2N1cl91cGRfbG9ja19h
bmRfdW5kbyhmbGFncywgY3Vyc29yLCB1cGRhdGUsIGNtcGxfaW5mbywKIAkJCQkJdGhyLCBtdHIs
ICZyb2xsX3B0cik7CiAJaWYgKGVyciAhPSBEQl9TVUNDRVNTKSB7Ci1lcnJfZXhpdDoKLQkJbWVt
X2hlYXBfZnJlZShoZWFwKTsKLQkJcmV0dXJuKGVycik7CisKKwkJZ290byBlcnJfZXhpdDsKIAl9
CiAKIAkvKiBPaywgd2UgbWF5IGRvIHRoZSByZXBsYWNlbWVudC4gU3RvcmUgb24gdGhlIHBhZ2Ug
aW5maW11bSB0aGUKQEAgLTIxMjcsOSArMjEyNiwxMCBAQCBlcnJfZXhpdDoKIAogCXBhZ2VfY3Vy
X21vdmVfdG9fbmV4dChwYWdlX2N1cnNvcik7CiAKKwllcnIgPSBEQl9TVUNDRVNTOworZXJyX2V4
aXQ6CiAJbWVtX2hlYXBfZnJlZShoZWFwKTsKLQotCXJldHVybihEQl9TVUNDRVNTKTsKKwlyZXR1
cm4oZXJyKTsKIH0KIAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKiovLyoqCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9sb2NrL2xvY2swbG9jay5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBs
b2NrLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDExMjA1MDEtcnc2Njdv
M3VwN2hoNzUwcAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDExMjA5MzMtcjhmbmhpZzVtNXFubm9oegpA
QCAtMzkzNSw4ICszOTM1LDggQEAgbG9ja19yZWNfdW5sb2NrKAogCWNvbnN0IHJlY190KgkJcmVj
LAkvKiE8IGluOiByZWNvcmQgKi8KIAllbnVtIGxvY2tfbW9kZQkJbG9ja19tb2RlKS8qITwgaW46
IExPQ0tfUyBvciBMT0NLX1ggKi8KIHsKKwlsb2NrX3QqCWZpcnN0X2xvY2s7CiAJbG9ja190Kgls
b2NrOwotCWxvY2tfdCoJcmVsZWFzZV9sb2NrCT0gTlVMTDsKIAl1bGludAloZWFwX25vOwogCiAJ
dXRfYWQodHJ4ICYmIHJlYyk7CkBAIC0zOTQ2LDQ4ICszOTQ2LDQwIEBAIGxvY2tfcmVjX3VubG9j
aygKIAogCW11dGV4X2VudGVyKCZrZXJuZWxfbXV0ZXgpOwogCi0JbG9jayA9IGxvY2tfcmVjX2dl
dF9maXJzdChibG9jaywgaGVhcF9ubyk7CisJZmlyc3RfbG9jayA9IGxvY2tfcmVjX2dldF9maXJz
dChibG9jaywgaGVhcF9ubyk7CiAKIAkvKiBGaW5kIHRoZSBsYXN0IGxvY2sgd2l0aCB0aGUgc2Ft
ZSBsb2NrX21vZGUgYW5kIHRyYW5zYWN0aW9uCiAJZnJvbSB0aGUgcmVjb3JkLiAqLwogCi0Jd2hp
bGUgKGxvY2sgIT0gTlVMTCkgeworCWZvciAobG9jayA9IGZpcnN0X2xvY2s7IGxvY2sgIT0gTlVM
TDsKKwkgICAgIGxvY2sgPSBsb2NrX3JlY19nZXRfbmV4dChoZWFwX25vLCBsb2NrKSkgewogCQlp
ZiAobG9jay0+dHJ4ID09IHRyeCAmJiBsb2NrX2dldF9tb2RlKGxvY2spID09IGxvY2tfbW9kZSkg
ewotCQkJcmVsZWFzZV9sb2NrID0gbG9jazsKIAkJCXV0X2EoIWxvY2tfZ2V0X3dhaXQobG9jaykp
OworCQkJbG9ja19yZWNfcmVzZXRfbnRoX2JpdChsb2NrLCBoZWFwX25vKTsKKwkJCWdvdG8gcmVs
ZWFzZWQ7CiAJCX0KLQotCQlsb2NrID0gbG9ja19yZWNfZ2V0X25leHQoaGVhcF9ubywgbG9jayk7
CiAJfQogCi0JLyogSWYgYSByZWNvcmQgbG9jayBpcyBmb3VuZCwgcmVsZWFzZSB0aGUgcmVjb3Jk
IGxvY2sgKi8KLQotCWlmIChVTklWX0xJS0VMWShyZWxlYXNlX2xvY2sgIT0gTlVMTCkpIHsKLQkJ
bG9ja19yZWNfcmVzZXRfbnRoX2JpdChyZWxlYXNlX2xvY2ssIGhlYXBfbm8pOwotCX0gZWxzZSB7
Ci0JCW11dGV4X2V4aXQoJmtlcm5lbF9tdXRleCk7Ci0JCXV0X3ByaW50X3RpbWVzdGFtcChzdGRl
cnIpOwotCQlmcHJpbnRmKHN0ZGVyciwKLQkJCSIgIElubm9EQjogRXJyb3I6IHVubG9jayByb3cg
Y291bGQgbm90IgotCQkJIiBmaW5kIGEgJWx1IG1vZGUgbG9jayBvbiB0aGUgcmVjb3JkXG4iLAot
CQkJKHVsb25nKSBsb2NrX21vZGUpOworCW11dGV4X2V4aXQoJmtlcm5lbF9tdXRleCk7CisJdXRf
cHJpbnRfdGltZXN0YW1wKHN0ZGVycik7CisJZnByaW50ZihzdGRlcnIsCisJCSIgIElubm9EQjog
RXJyb3I6IHVubG9jayByb3cgY291bGQgbm90IgorCQkiIGZpbmQgYSAlbHUgbW9kZSBsb2NrIG9u
IHRoZSByZWNvcmRcbiIsCisJCSh1bG9uZykgbG9ja19tb2RlKTsKIAotCQlyZXR1cm47Ci0JfQor
CXJldHVybjsKIAorcmVsZWFzZWQ6CiAJLyogQ2hlY2sgaWYgd2UgY2FuIG5vdyBncmFudCB3YWl0
aW5nIGxvY2sgcmVxdWVzdHMgKi8KIAotCWxvY2sgPSBsb2NrX3JlY19nZXRfZmlyc3QoYmxvY2ss
IGhlYXBfbm8pOwotCi0Jd2hpbGUgKGxvY2sgIT0gTlVMTCkgeworCWZvciAobG9jayA9IGZpcnN0
X2xvY2s7IGxvY2sgIT0gTlVMTDsKKwkgICAgIGxvY2sgPSBsb2NrX3JlY19nZXRfbmV4dChoZWFw
X25vLCBsb2NrKSkgewogCQlpZiAobG9ja19nZXRfd2FpdChsb2NrKQogCQkgICAgJiYgIWxvY2tf
cmVjX2hhc190b193YWl0X2luX3F1ZXVlKGxvY2spKSB7CiAKIAkJCS8qIEdyYW50IHRoZSBsb2Nr
ICovCiAJCQlsb2NrX2dyYW50KGxvY2spOwogCQl9Ci0KLQkJbG9jayA9IGxvY2tfcmVjX2dldF9u
ZXh0KGhlYXBfbm8sIGxvY2spOwogCX0KIAogCW11dGV4X2V4aXQoJmtlcm5lbF9tdXRleCk7Cgo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG15c3FsLmMnCi0tLSBh
L3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBteXNxbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwNjAxMTIwNTAxLXJ3NjY3bzN1cDdoaDc1MHAKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9yb3cvcm93MG15c3FsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2
MDExMjA5MzMtcjhmbmhpZzVtNXFubm9oegpAQCAtNjI1LDYgKzYyNSw4IEBAIHJvd19jcmVhdGVf
cHJlYnVpbHQoCiAKIAlwcmVidWlsdC0+c2VsZWN0X2xvY2tfdHlwZSA9IExPQ0tfTk9ORTsKIAlw
cmVidWlsdC0+c3RvcmVkX3NlbGVjdF9sb2NrX3R5cGUgPSA5OTk5OTk5OTsKKwlVTklWX01FTV9J
TlZBTElEKCZwcmVidWlsdC0+c3RvcmVkX3NlbGVjdF9sb2NrX3R5cGUsCisJCQkgc2l6ZW9mIHBy
ZWJ1aWx0LT5zdG9yZWRfc2VsZWN0X2xvY2tfdHlwZSk7CiAKIAlwcmVidWlsdC0+c2VhcmNoX3R1
cGxlID0gZHR1cGxlX2NyZWF0ZSgKIAkJaGVhcCwgMiAqIGRpY3RfdGFibGVfZ2V0X25fY29scyh0
YWJsZSkpOwoK

--===============1601473552==
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: 59592d695acf6f1fa76cd0990d94d04eca158db9
# timestamp: 2010-06-01 15:09:42 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   rw667o3up7hh750p
# 
# Begin bundle
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
dVOmN5l/wcSe9/F3JFOFCQKd6QIg


--===============1601473552==--