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

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTEyMDUyMS1xNDho
azA1bmU0ajFzMm8wCgogMzQ5MCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTAxCiAgICAgIE1pbm9y
IGNsZWFudXAuCiAgICAgIAogICAgICBsb2NrX3JlY191bmxvY2soKTogQ2FjaGUgZmlyc3RfbG9j
ayBhbmQgcmV3cml0ZSB3aGlsZSgpIGxvb3BzIGFzIGZvcigpLgogICAgICAKICAgICAgYnRyX2N1
cl9vcHRpbWlzdGljX3VwZGF0ZSgpOiBVc2UgY29tbW9uIGVycm9yIGhhbmRsaW5nIHJldHVybi4K
ICAgICAgCiAgICAgIHJvd19jcmVhdGVfcHJlYnVpbHQoKTogQWRkIFZhbGdyaW5kIGluc3RydW1l
bnRhdGlvbi4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9i
dHIwY3VyLmMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2xvY2svbG9jazBsb2NrLmMKICAg
ICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwbXlzcWwuYwo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwY3VyLmMnCi0tLSBhL3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9idHIvYnRyMGN1ci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTAwNjAxMTIwNTIxLXE0OGhrMDVuZTRqMXMybzAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDExMjA3
NTEtMXVxN2JidGE1bjd0czBxcgpAQCAtMTk1OSw5ICsxOTU5LDggQEAgYW55X2V4dGVybjoKIAll
cnIgPSBidHJfY3VyX3VwZF9sb2NrX2FuZF91bmRvKGZsYWdzLCBjdXJzb3IsIHVwZGF0ZSwgY21w
bF9pbmZvLAogCQkJCQl0aHIsIG10ciwgJnJvbGxfcHRyKTsKIAlpZiAoZXJyICE9IERCX1NVQ0NF
U1MpIHsKLWVycl9leGl0OgotCQltZW1faGVhcF9mcmVlKGhlYXApOwotCQlyZXR1cm4oZXJyKTsK
KworCQlnb3RvIGVycl9leGl0OwogCX0KIAogCS8qIE9rLCB3ZSBtYXkgZG8gdGhlIHJlcGxhY2Vt
ZW50LiBTdG9yZSBvbiB0aGUgcGFnZSBpbmZpbXVtIHRoZQpAQCAtMjAwNyw5ICsyMDA2LDEwIEBA
IGVycl9leGl0OgogCiAJcGFnZV9jdXJfbW92ZV90b19uZXh0KHBhZ2VfY3Vyc29yKTsKIAorCWVy
ciA9IERCX1NVQ0NFU1M7CitlcnJfZXhpdDoKIAltZW1faGVhcF9mcmVlKGhlYXApOwotCi0JcmV0
dXJuKERCX1NVQ0NFU1MpOworCXJldHVybihlcnIpOwogfQogCiAvKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vbG9jay9sb2NrMGxvY2suYycKLS0tIGEv
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL2xvY2svbG9jazBsb2NrLmMJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDA2MDExMjA1MjEtcTQ4aGswNW5lNGoxczJvMAorKysgYi9zdG9yYWdl
L2lubm9kYl9wbHVnaW4vbG9jay9sb2NrMGxvY2suYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMDYwMTEyMDc1MS0xdXE3YmJ0YTVuN3RzMHFyCkBAIC0zOTM1LDggKzM5MzUsOCBA
QCBsb2NrX3JlY191bmxvY2soCiAJY29uc3QgcmVjX3QqCQlyZWMsCS8qITwgaW46IHJlY29yZCAq
LwogCWVudW0gbG9ja19tb2RlCQlsb2NrX21vZGUpLyohPCBpbjogTE9DS19TIG9yIExPQ0tfWCAq
LwogeworCWxvY2tfdCoJZmlyc3RfbG9jazsKIAlsb2NrX3QqCWxvY2s7Ci0JbG9ja190KglyZWxl
YXNlX2xvY2sJPSBOVUxMOwogCXVsaW50CWhlYXBfbm87CiAKIAl1dF9hZCh0cnggJiYgcmVjKTsK
QEAgLTM5NDYsNDggKzM5NDYsNDAgQEAgbG9ja19yZWNfdW5sb2NrKAogCiAJbXV0ZXhfZW50ZXIo
Jmtlcm5lbF9tdXRleCk7CiAKLQlsb2NrID0gbG9ja19yZWNfZ2V0X2ZpcnN0KGJsb2NrLCBoZWFw
X25vKTsKKwlmaXJzdF9sb2NrID0gbG9ja19yZWNfZ2V0X2ZpcnN0KGJsb2NrLCBoZWFwX25vKTsK
IAogCS8qIEZpbmQgdGhlIGxhc3QgbG9jayB3aXRoIHRoZSBzYW1lIGxvY2tfbW9kZSBhbmQgdHJh
bnNhY3Rpb24KIAlmcm9tIHRoZSByZWNvcmQuICovCiAKLQl3aGlsZSAobG9jayAhPSBOVUxMKSB7
CisJZm9yIChsb2NrID0gZmlyc3RfbG9jazsgbG9jayAhPSBOVUxMOworCSAgICAgbG9jayA9IGxv
Y2tfcmVjX2dldF9uZXh0KGhlYXBfbm8sIGxvY2spKSB7CiAJCWlmIChsb2NrLT50cnggPT0gdHJ4
ICYmIGxvY2tfZ2V0X21vZGUobG9jaykgPT0gbG9ja19tb2RlKSB7Ci0JCQlyZWxlYXNlX2xvY2sg
PSBsb2NrOwogCQkJdXRfYSghbG9ja19nZXRfd2FpdChsb2NrKSk7CisJCQlsb2NrX3JlY19yZXNl
dF9udGhfYml0KGxvY2ssIGhlYXBfbm8pOworCQkJZ290byByZWxlYXNlZDsKIAkJfQotCi0JCWxv
Y2sgPSBsb2NrX3JlY19nZXRfbmV4dChoZWFwX25vLCBsb2NrKTsKIAl9CiAKLQkvKiBJZiBhIHJl
Y29yZCBsb2NrIGlzIGZvdW5kLCByZWxlYXNlIHRoZSByZWNvcmQgbG9jayAqLwotCi0JaWYgKFVO
SVZfTElLRUxZKHJlbGVhc2VfbG9jayAhPSBOVUxMKSkgewotCQlsb2NrX3JlY19yZXNldF9udGhf
Yml0KHJlbGVhc2VfbG9jaywgaGVhcF9ubyk7Ci0JfSBlbHNlIHsKLQkJbXV0ZXhfZXhpdCgma2Vy
bmVsX211dGV4KTsKLQkJdXRfcHJpbnRfdGltZXN0YW1wKHN0ZGVycik7Ci0JCWZwcmludGYoc3Rk
ZXJyLAotCQkJIiAgSW5ub0RCOiBFcnJvcjogdW5sb2NrIHJvdyBjb3VsZCBub3QiCi0JCQkiIGZp
bmQgYSAlbHUgbW9kZSBsb2NrIG9uIHRoZSByZWNvcmRcbiIsCi0JCQkodWxvbmcpIGxvY2tfbW9k
ZSk7CisJbXV0ZXhfZXhpdCgma2VybmVsX211dGV4KTsKKwl1dF9wcmludF90aW1lc3RhbXAoc3Rk
ZXJyKTsKKwlmcHJpbnRmKHN0ZGVyciwKKwkJIiAgSW5ub0RCOiBFcnJvcjogdW5sb2NrIHJvdyBj
b3VsZCBub3QiCisJCSIgZmluZCBhICVsdSBtb2RlIGxvY2sgb24gdGhlIHJlY29yZFxuIiwKKwkJ
KHVsb25nKSBsb2NrX21vZGUpOwogCi0JCXJldHVybjsKLQl9CisJcmV0dXJuOwogCityZWxlYXNl
ZDoKIAkvKiBDaGVjayBpZiB3ZSBjYW4gbm93IGdyYW50IHdhaXRpbmcgbG9jayByZXF1ZXN0cyAq
LwogCi0JbG9jayA9IGxvY2tfcmVjX2dldF9maXJzdChibG9jaywgaGVhcF9ubyk7Ci0KLQl3aGls
ZSAobG9jayAhPSBOVUxMKSB7CisJZm9yIChsb2NrID0gZmlyc3RfbG9jazsgbG9jayAhPSBOVUxM
OworCSAgICAgbG9jayA9IGxvY2tfcmVjX2dldF9uZXh0KGhlYXBfbm8sIGxvY2spKSB7CiAJCWlm
IChsb2NrX2dldF93YWl0KGxvY2spCiAJCSAgICAmJiAhbG9ja19yZWNfaGFzX3RvX3dhaXRfaW5f
cXVldWUobG9jaykpIHsKIAogCQkJLyogR3JhbnQgdGhlIGxvY2sgKi8KIAkJCWxvY2tfZ3JhbnQo
bG9jayk7CiAJCX0KLQotCQlsb2NrID0gbG9ja19yZWNfZ2V0X25leHQoaGVhcF9ubywgbG9jayk7
CiAJfQogCiAJbXV0ZXhfZXhpdCgma2VybmVsX211dGV4KTsKCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBteXNxbC5jJwotLS0gYS9zdG9yYWdlL2lubm9k
Yl9wbHVnaW4vcm93L3JvdzBteXNxbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTAwNjAxMTIwNTIxLXE0OGhrMDVuZTRqMXMybzAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L3Jvdy9yb3cwbXlzcWwuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTEy
MDc1MS0xdXE3YmJ0YTVuN3RzMHFyCkBAIC02MjUsNiArNjI1LDggQEAgcm93X2NyZWF0ZV9wcmVi
dWlsdCgKIAogCXByZWJ1aWx0LT5zZWxlY3RfbG9ja190eXBlID0gTE9DS19OT05FOwogCXByZWJ1
aWx0LT5zdG9yZWRfc2VsZWN0X2xvY2tfdHlwZSA9IDk5OTk5OTk5OworCVVOSVZfTUVNX0lOVkFM
SUQoJnByZWJ1aWx0LT5zdG9yZWRfc2VsZWN0X2xvY2tfdHlwZSwKKwkJCSBzaXplb2YgcHJlYnVp
bHQtPnN0b3JlZF9zZWxlY3RfbG9ja190eXBlKTsKIAogCXByZWJ1aWx0LT5zZWFyY2hfdHVwbGUg
PSBkdHVwbGVfY3JlYXRlKAogCQloZWFwLCAyICogZGljdF90YWJsZV9nZXRfbl9jb2xzKHRhYmxl
KSk7Cgo=

--===============0757650772==
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:05 +0300
# base_revision_id: marko.makela@stripped\
#   q48hk05ne4j1s2o0
# 
# Begin bundle
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


--===============0757650772==--