From: marko.makela
Date: May 5 2010 9:52am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3444) Bug#38999
List-Archive: http://lists.mysql.com/commits/107438
X-Bug: 38999
Message-Id: <201005050953.o459ZPEO014329@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0239701476=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDQxMzE1MTctNjFpdHBy
Y2oxM2k5emhkZgoKIDM0NDQgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICBBZGQgVmFs
Z3JpbmQgZGlhZ25vc3RpY3MgdG8gdHJhY2sgZG93biBCdWcgIzM4OTk5LgoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9y
b3cvcm93MHNlbC5jCTIwMTAtMDQtMjkgMTM6Mjk6NDUgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9yb3cvcm93MHNlbC5jCTIwMTAtMDUtMDUgMDk6NTI6NDcgKzAwMDAKQEAgLTI0NTIsNiAr
MjQ1Miw3IEBAIHJvd19zZWxfZmllbGRfc3RvcmVfaW5fbXlzcWxfZm9ybWF0KAogCWJ5dGUqCXBh
ZF9wdHI7CiAKIAl1dF9hZChsZW4gIT0gVU5JVl9TUUxfTlVMTCk7CisJVU5JVl9NRU1fQVNTRVJU
X1JXKGRhdGEsIGxlbik7CiAKIAlpZiAodGVtcGwtPnR5cGUgPT0gREFUQV9JTlQpIHsKIAkJLyog
Q29udmVydCBpbnRlZ2VyIGRhdGEgZnJvbSBJbm5vYmFzZSB0byBhIGxpdHRsZS1lbmRpYW4KQEAg
LTI2ODcsNiArMjY4OCw5IEBAIHJvd19zZWxfc3RvcmVfbXlzcWxfcmVjKAogCQkJLyogTXlTUUwg
YXNzdW1lcyB0aGF0IHRoZSBmaWVsZCBmb3IgYW4gU1FMCiAJCQlOVUxMIHZhbHVlIGlzIHNldCB0
byB0aGUgZGVmYXVsdCB2YWx1ZS4gKi8KIAorCQkJVU5JVl9NRU1fQVNTRVJUX1JXKHByZWJ1aWx0
LT5kZWZhdWx0X3JlYworCQkJCQkgICArIHRlbXBsLT5teXNxbF9jb2xfb2Zmc2V0LAorCQkJCQkg
ICB0ZW1wbC0+bXlzcWxfY29sX2xlbik7CiAJCQlteXNxbF9yZWNbdGVtcGwtPm15c3FsX251bGxf
Ynl0ZV9vZmZzZXRdCiAJCQkJfD0gKGJ5dGUpIHRlbXBsLT5teXNxbF9udWxsX2JpdF9tYXNrOwog
CQkJbWVtY3B5KG15c3FsX3JlYyArIHRlbXBsLT5teXNxbF9jb2xfb2Zmc2V0LApAQCAtMzAwNyw2
ICszMDExLDExIEBAIHJvd19zZWxfcG9wX2NhY2hlZF9yb3dfZm9yX215c3FsKAogCiAJCWZvciAo
aSA9IDA7IGkgPCBwcmVidWlsdC0+bl90ZW1wbGF0ZTsgaSsrKSB7CiAJCQl0ZW1wbCA9IHByZWJ1
aWx0LT5teXNxbF90ZW1wbGF0ZSArIGk7CisjaWYgMCAvKiBTb21lIG9mIHRoZSBjYWNoZWRfcmVj
IG1heSBsZWdpdGltYXRlbHkgYmUgdW5pbml0aWFsaXplZC4gKi8KKwkJCVVOSVZfTUVNX0FTU0VS
VF9SVyhjYWNoZWRfcmVjCisJCQkJCSAgICsgdGVtcGwtPm15c3FsX2NvbF9vZmZzZXQsCisJCQkJ
CSAgIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsKKyNlbmRpZgogCQkJdXRfbWVtY3B5KGJ1ZiArIHRl
bXBsLT5teXNxbF9jb2xfb2Zmc2V0LAogCQkJCSAgY2FjaGVkX3JlYyArIHRlbXBsLT5teXNxbF9j
b2xfb2Zmc2V0LAogCQkJCSAgdGVtcGwtPm15c3FsX2NvbF9sZW4pOwpAQCAtMzAyMSw2ICszMDMw
LDExIEBAIHJvd19zZWxfcG9wX2NhY2hlZF9yb3dfZm9yX215c3FsKAogCQl9CiAJfQogCWVsc2Ug
eworI2lmIDAgLyogU29tZSBvZiB0aGUgY2FjaGVkX3JlYyBtYXkgbGVnaXRpbWF0ZWx5IGJlIHVu
aW5pdGlhbGl6ZWQuICovCisJCVVOSVZfTUVNX0FTU0VSVF9SVyhwcmVidWlsdC0+ZmV0Y2hfY2Fj
aGUKKwkJCQkgICBbcHJlYnVpbHQtPmZldGNoX2NhY2hlX2ZpcnN0XSwKKwkJCQkgICBwcmVidWls
dC0+bXlzcWxfcHJlZml4X2xlbik7CisjZW5kaWYKIAkJdXRfbWVtY3B5KGJ1ZiwKIAkJCSAgcHJl
YnVpbHQtPmZldGNoX2NhY2hlW3ByZWJ1aWx0LT5mZXRjaF9jYWNoZV9maXJzdF0sCiAJCQkgIHBy
ZWJ1aWx0LT5teXNxbF9wcmVmaXhfbGVuKTsKQEAgLTMwNzAsNiArMzA4NCw4IEBAIHJvd19zZWxf
cHVzaF9jYWNoZV9yb3dfZm9yX215c3FsKAogCX0KIAogCXV0X2FkKHByZWJ1aWx0LT5mZXRjaF9j
YWNoZV9maXJzdCA9PSAwKTsKKwlVTklWX01FTV9JTlZBTElEKHByZWJ1aWx0LT5mZXRjaF9jYWNo
ZVtwcmVidWlsdC0+bl9mZXRjaF9jYWNoZWRdLAorCQkJIHByZWJ1aWx0LT5teXNxbF9yb3dfbGVu
KTsKIAogCWlmIChVTklWX1VOTElLRUxZKCFyb3dfc2VsX3N0b3JlX215c3FsX3JlYygKIAkJCQkg
IHByZWJ1aWx0LT5mZXRjaF9jYWNoZVsKCg==

--===============0239701476==
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/mysql/5.1-innodb/
# testament_sha1: 3e56292ae280ffff670d5c8c50ba1964062e341a
# timestamp: 2010-05-05 12:52:56 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   61itprcj13i9zhdf
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYneDRcAAiHfgGAwW3///3cn
H4q////wUATMXs7bDbW7MaO7aaEikmoAaaM9U0NN6iNMj0mQaPU0ANAAElE0abRGimakxpGygBoA
NNDIGhoASQhRppqZoNU2ET0J6TTQ0aMnqA0AxGg4yZNNMJkZAwIxNGCMINGmAAQSSCaBMUyZpT0z
SR+po0TJ6jQGgAANIFZiRUQNNjY+urSNbMXYju7l2RlHD0zGpdnLhRVjLG1eqUSBXtkoi9mm9uK4
uGPEL5YsPESKzSZzLDMwvx2LtlVcSx2zMjZZu7TbQ+2ZVE69PIdmTwNhSX4iT5yTQcWceKHa9XI+
+xBzDkDHdivm/PXoiw/t0bWaGMCG1YmQUFbhCotE+MvzneY2U3raMROGbAP2ir6hUIcsyeFgMvwt
Ur804tP53DqodVawZkG0Q7oMxwsXct7civz0BPanfS0pJHO4hliUvcrU9wyBxTLzPDCuJOejpFxq
xXDKb9F9PUI59FMMWJosbLJSeutU2nxLSahM3WXDLUq5eeuoe6I45TuC7OhBV02ZEj1ELGiMsgWi
uePfqUb2KYhp529aL1IkaiuJYGICbDVKuHnaT3rxUYs5wEFSwplhZrqggZKg+Caw76ckQxkPMvfk
SGGO636macF8ZmvPnog5HCxN4yjmmFGMkYDsy5+A85OIT7paxaEqmxYXrfJlqwW6jKKgLR6ytN9c
JPnwobnKJiYx2Uc6mBo998rYlhwF2RJ+lx2L33kE9nQHPJxFW7Wmoa12xYqetpqqiDixRtLAlFdy
HYs2fylrCwY1nNeWzm6MS5mIbj5Tm6om5SHjSkcWZMI7e8LbbyZm+u37x1o/YTR1N90dUrEMjPrR
SwIAwRCJ+Q+iGvRCANi1aMaMqO4PgHSGm/fZ0yI9TeDKeBU1358FFB0DHKbyZI7+CXNuYRdIrHhw
Fw9CRdnenF01vPWK+hCrsyM6L6ip0GELR9aWCKDFQBAgZCvPTprGqA77DpPDEsGkNVWhLUmIYQ1Y
Y0iuLKrVkzHIaRjrKLcUT1Cvhm3GoqOxypevry8ayWHCPVJebjMw6Rx8StKjeQ7+kVnVUfwpltaw
yEQdgkV0DwcuSGu4dOfTrTJFYno+JHKmRPXNO14YFuVRXEFAElCYMt5Vn3GtYHv2kSdSMhgsays+
ePhI0aNsFSb+ffiKacuTJS95GG8KQOqnbGazDYSmtKzAka9maImTm+MVaAzpRC+nEMlZpN+qEswF
WcCcxMFjGbUr1kF1iteqVv/WCR4Ar40jby9AMvpKy5PDEGIpG20QyvWQKA1wSxdnlOUpGntYWXsE
cfDcfIcmvVpvEzMt22k9Gj5RX2GQcVfEJuaVyHKDgrU453oiUeNW+QMm4Ltl+TJmQyfx7WEUssOE
1pL5jVAeWiO0RSFSxcqssyXTrFra0ww2KiJQDBVorXSu+obSlB3uxS1bOFTqJbaiJodcKfLjg5WN
HjikMoTtYO9HM/kmJMSXAT1shAZspuWrYRcUlIDSCrQlMbGrnRc9b0uwWZ0C3B/cQhIHvLwsk4kx
VcUZBySgKKFD2JibLNODZu1pZ97AUVfkrW91ZAKCxix8ji6KkTVmZzNnoSaEgv4KFHF/xdyRThQk
IneDRcA=


--===============0239701476==--