From: marko.makela
Date: May 19 2010 8:16am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3473)
List-Archive: http://lists.mysql.com/commits/108580
Message-Id: <201005190816.o4J8AJPM021361@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1286415928=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTkwODA3NDMtNW15ZjFn
N3Y2cGZ5c2lkdAoKIDM0NzMgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xOQogICAgICBNYWtlIFVO
SVZfREVCVUcgVmFsZ3JpbmQgZnJpZW5kbHkgaW4gdGhlIGJ1aWx0LWluIElubm9EQi4KICAgICAg
VXNlIHwgaW5zdGVhZCBvZiArLCBhbmQgbWFzayBvdXQgdGhlIGRvbnQtY2FyZSBiaXRzIGluIGRl
YnVnIGFzc2VydGlvbnMuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS9tYWNoMGRhdGEuaWMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5j
bHVkZS9tYWNoMGRhdGEuaWMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9tYWNoMGRh
dGEuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTkwODA3NDMtNW15ZjFn
N3Y2cGZ5c2lkdAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbWFjaDBkYXRhLmljCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE5MDgxNjE4LWgzOHEwMnF4dXZjb3di
dGsKQEAgLTE5LDcgKzE5LDcgQEAgbWFjaF93cml0ZV90b18xKAogCXVsaW50CW4pCS8qIGluOiB1
bGludCBpbnRlZ2VyIHRvIGJlIHN0b3JlZCwgPj0gMCwgPCAyNTYgKi8KIHsKIAl1dF9hZChiKTsK
LQl1dF9hZChuIDw9IDB4RkZVTCk7CisJdXRfYWQoKG4gfCAweEZGVUwpIDw9IDB4RkZVTCk7CiAK
IAliWzBdID0gKGJ5dGUpbjsKIH0KQEAgLTQ4LDcgKzQ4LDcgQEAgbWFjaF93cml0ZV90b18yKAog
CXVsaW50CW4pCS8qIGluOiB1bGludCBpbnRlZ2VyIHRvIGJlIHN0b3JlZCAqLwogewogCXV0X2Fk
KGIpOwotCXV0X2FkKG4gPD0gMHhGRkZGVUwpOworCXV0X2FkKChuIHwgMHhGRkZGVUwpIDw9IDB4
RkZGRlVMKTsKIAogCWJbMF0gPSAoYnl0ZSkobiA+PiA4KTsKIAliWzFdID0gKGJ5dGUpKG4pOwpA
QCAtNjQsMTAgKzY0LDcgQEAgbWFjaF9yZWFkX2Zyb21fMigKIAkJCS8qIG91dDogdWxpbnQgaW50
ZWdlciAqLwogCWJ5dGUqCWIpCS8qIGluOiBwb2ludGVyIHRvIDIgYnl0ZXMgKi8KIHsKLQl1dF9h
ZChiKTsKLQlyZXR1cm4oICgodWxpbnQpKGJbMF0pIDw8IDgpCi0JCSsgKHVsaW50KShiWzFdKQot
CQkpOworCXJldHVybigoKHVsaW50KShiWzBdKSA8PCA4KSB8ICh1bGludCkoYlsxXSkpOwogfQog
CiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqCkBAIC0xMTIsNyArMTA5LDcgQEAgbWFjaF93cml0ZV90b18zKAogCXVsaW50CW4pCS8q
IGluOiB1bGludCBpbnRlZ2VyIHRvIGJlIHN0b3JlZCAqLwogewogCXV0X2FkKGIpOwotCXV0X2Fk
KG4gPD0gMHhGRkZGRkZVTCk7CisJdXRfYWQoKG4gfCAweEZGRkZGRlVMKSA8PSAweEZGRkZGRlVM
KTsKIAogCWJbMF0gPSAoYnl0ZSkobiA+PiAxNik7CiAJYlsxXSA9IChieXRlKShuID4+IDgpOwpA
QCAtMTMxLDggKzEyOCw4IEBAIG1hY2hfcmVhZF9mcm9tXzMoCiB7CiAJdXRfYWQoYik7CiAJcmV0
dXJuKCAoKHVsaW50KShiWzBdKSA8PCAxNikKLQkJKyAoKHVsaW50KShiWzFdKSA8PCA4KQotCQkr
ICh1bGludCkoYlsyXSkKKwkJfCAoKHVsaW50KShiWzFdKSA8PCA4KQorCQl8ICh1bGludCkoYlsy
XSkKIAkJKTsKIH0KIApAQCAtMTY2LDkgKzE2Myw5IEBAIG1hY2hfcmVhZF9mcm9tXzQoCiB7CiAJ
dXRfYWQoYik7CiAJcmV0dXJuKCAoKHVsaW50KShiWzBdKSA8PCAyNCkKLQkJKyAoKHVsaW50KShi
WzFdKSA8PCAxNikKLQkJKyAoKHVsaW50KShiWzJdKSA8PCA4KQotCQkrICh1bGludCkoYlszXSkK
KwkJfCAoKHVsaW50KShiWzFdKSA8PCAxNikKKwkJfCAoKHVsaW50KShiWzJdKSA8PCA4KQorCQl8
ICh1bGludCkoYlszXSkKIAkJKTsKIH0KIApAQCAtNjcwLDcgKzY2Nyw3IEBAIG1hY2hfcmVhZF9m
cm9tXzJfbGl0dGxlX2VuZGlhbigKIAkJCQkvKiBvdXQ6IHVuc2lnbmVkIGxvbmcgaW50ICovCiAJ
Ynl0ZSoJYnVmKQkJLyogaW46IGZyb20gd2hlcmUgdG8gcmVhZCAqLwogewotCXJldHVybigodWxp
bnQpKCpidWYpICsgKCh1bGludCkoKihidWYgKyAxKSkpICogMjU2KTsKKwlyZXR1cm4oKHVsaW50
KShidWZbMF0pIHwgKCh1bGludCkoYnVmWzFdKSA8PCA4KSk7CiB9CiAKIC8qKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCgo=

--===============1286415928==
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: 22b1d3abf64c90e58ebcc95304f706b19b5999ae
# timestamp: 2010-05-19 11:16:43 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   5myf1g7v6pfysidt
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVHo6o0AAjPfgFAwW2///1en
Awq/7//0UASYNvd2WtuZt13Rs3QkkiT0xTDUeSejTU9TJ5JkaNAMgBpoBJSaTZGmk0ymamhpoNNN
AaANAAAJIghE8p6JsmiMkPU2keiAGNBBoPUOaYmTJowmCYmmATAIYIwIwCSRMiYE0noGmVNk1NPU
D01PUA2ppoALdgSESRmzWLMjRfz6pDA/h3HzqiqhlxM9MYaZCXPqorreycXk2vj4BQy7MC25gZke
MuhmZu9L9TqrdmfpZ7puPJoNtyTmsjD0PSGcCvRv923vgSGP9rvPA8454xg7y84Glgqwc4yCx3S5
dd3MT8YVxbl1IH0M4G4dUn47fz1ZL174KDZkDQEwzMeu48hmRvTPnQM8E4d03BnB8UGdYQ9glyOi
JvD72aslDHZsYjKtAjG/KRVwaER2kEwydeBzt9sj4K65BtFZshCDWDJGglJ110ckEB33LzWuXoJj
MhNTS8zWM7nUFcCVBl20HoyWhLHZqwYpHBzXYNGqtPcLE94MZOQXXUgnkllpLgYFR84FRihCQtbE
RWTNYONRFs4W0jqCRiUeFvRuiLTWEDtLS8VGV9drJpYka6cdhHEVdZgSBVUFzSVIrIjgiPeysCyz
KGDgcRTj7xDyggZXVMfMax33X1iggsssg0NckNJrRGGAnMxRyq+rHMsgLHZXOMk1fJLQmQx/cFG0
GppRAdTJfJ5ZUtytyJTuUZm00OgNYMFhmETtcGMVLRDwcWzlwZQ3FBMQl3uuGK1GBUEZYruQ/1s3
BGfeczXAMjWxJYvTtbAhiOmJHcy2bDd1Qm5ODwzLQI97z4MfBq3Wn/cF+iYhRu3TuE0956vRthZn
QR7nU6mGYLnPSOsczflQT0JkNR3P0tEyaofDmNBnOwR/SHeuHARZvTWDw8YiM3f1GaJrt8/KsVFC
RFlct14THMNg8h4pYGSjt+PvFE0xz7xDF841JpxMpYHYfVHC3gqblXOEIMIdP9BFvcKOVphl7SCY
6CC2kYhcJiXbaCRXI6CF6FQe2XKZ82FOSLJQ1lRI/d0WHkPyk1BKEkadCLq8CRbJtJiJqp7cQxhB
5TWr04hyemkl0kwaVMUhXjMA+MXzZVSYMbgrnXLHIuQUFX1xmbaGQTYA2wqdlQPw8qam7uFkUkTc
Z9QXSGixjmqdgccpXIN2mUbAMV4HP6o1SL4OnuT6f2wi8MiR2TJhGrIIZRzoGZ2FMA17xGo44CLH
YnQcm02qwfrsNFMMhp61EgxsU5fIlScZyUGYNMHPx1L2yYm2V4hpgcyGT9qRAqpvSIgbm2QRxEbg
nVblciiFkwvFFFCv2i2GZRzW7Y3QLPLpFinUYlUPZmFwMfs5K2UKqM/XUkY1aYTyhSpMRTproDjN
nOzB4uUly1APxUrooINipFCvXFBJvba0yajvIKykg6i4mYt2jhtYohOFatcQZOsHlM6mDzINEFPU
R2FfFm6FaKtRbfAo3fSAtIryaKp9UjGOV1aZdhL3zw6lqGGD/i7kinChIKPR1Ro=


--===============1286415928==--