From: marko.makela
Date: June 22 2010 7:58am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3110)
List-Archive: http://lists.mysql.com/commits/111732
Message-Id: <201006220758.o5M7weET012880@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0438668205=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMTEwNTMzMy1wYXB5
Y3BqcjNzbXNreXh2CgogMzExMCBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTIyCiAgICAgIGRpY3Rf
bG9hZF9jb2x1bW5fbG93KCk6IEluaXRpYWxpemUgcG9zLiBJbXByb3ZlIGRvY3VtZW50YXRpb24u
CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuYwog
ICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBsb2FkLmgKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuYycKLS0tIGEvc3RvcmFnZS9pbm5v
YmFzZS9kaWN0L2RpY3QwbG9hZC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NjIxMTA1MzMzLXBhcHljcGpyM3Ntc2t5eHYKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2Rp
Y3QwbG9hZC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjIyMDc1ODIyLTMz
bGU5NDBwM2VrOHJwNDYKQEAgLTc4MiwxMiArNzgyLDEzIEBAIGNvbnN0IGNoYXIqCiBkaWN0X2xv
YWRfY29sdW1uX2xvdygKIC8qPT09PT09PT09PT09PT09PT0qLwogCWRpY3RfdGFibGVfdCoJdGFi
bGUsCQkvKiE8IGluL291dDogdGFibGUsIGNvdWxkIGJlIE5VTEwKLQkJCQkJaWYgd2UganVzdCBw
b2x1bGF0ZSBhIGRpY3RfY29sdW1uX3QKKwkJCQkJaWYgd2UganVzdCBwb3B1bGF0ZSBhIGRpY3Rf
Y29sdW1uX3QKIAkJCQkJc3RydWN0IHdpdGggaW5mb3JtYXRpb24gZnJvbQogCQkJCQlhIFNZU19D
T0xVTU5TIHJlY29yZCAqLwogCW1lbV9oZWFwX3QqCWhlYXAsCQkvKiE8IGluL291dDogbWVtb3J5
IGhlYXAKIAkJCQkJZm9yIHRlbXBvcmFyeSBzdG9yYWdlICovCi0JZGljdF9jb2xfdCoJY29sdW1u
LAkJLyohPCBvdXQ6IGRpY3RfY29sdW1uX3QgdG8gZmlsbCAqLworCWRpY3RfY29sX3QqCWNvbHVt
biwJCS8qITwgb3V0OiBkaWN0X2NvbHVtbl90IHRvIGZpbGwsCisJCQkJCW9yIE5VTEwgaWYgdGFi
bGUgIT0gTlVMTCAqLwogCWR1bGludCoJCXRhYmxlX2lkLAkvKiE8IG91dDogdGFibGUgaWQgKi8K
IAljb25zdCBjaGFyKioJY29sX25hbWUsCS8qITwgb3V0OiBjb2x1bW4gbmFtZSAqLwogCWNvbnN0
IHJlY190KglyZWMpCQkvKiE8IGluOiBTWVNfQ09MVU1OUyByZWNvcmQgKi8KQEAgLTgwMCw2ICs4
MDEsOCBAQCBkaWN0X2xvYWRfY29sdW1uX2xvdygKIAl1bGludAkJY29sX2xlbjsKIAl1bGludAkJ
cG9zOwogCisJdXRfYWQodGFibGUgfHwgY29sdW1uKTsKKwogCWlmIChVTklWX1VOTElLRUxZKHJl
Y19nZXRfZGVsZXRlZF9mbGFnKHJlYywgMCkpKSB7CiAJCXJldHVybigiZGVsZXRlLW1hcmtlZCBy
ZWNvcmQgaW4gU1lTX0NPTFVNTlMiKTsKIAl9CkBAIC04MjcsOSArODMwLDkgQEAgZXJyX2xlbjoK
IAkJZ290byBlcnJfbGVuOwogCX0KIAotCWlmICghdGFibGUpIHsKLQkJcG9zID0gbWFjaF9yZWFk
X2Zyb21fNChmaWVsZCk7Ci0JfSBlbHNlIGlmIChVTklWX1VOTElLRUxZKHRhYmxlLT5uX2RlZiAh
PSBtYWNoX3JlYWRfZnJvbV80KGZpZWxkKSkpIHsKKwlwb3MgPSBtYWNoX3JlYWRfZnJvbV80KGZp
ZWxkKTsKKworCWlmIChVTklWX1VOTElLRUxZKHRhYmxlICYmIHRhYmxlLT5uX2RlZiAhPSBwb3Mp
KSB7CiAJCXJldHVybigiU1lTX0NPTFVNTlMuUE9TIG1pc21hdGNoIik7CiAJfQogCgo9PT0gbW9k
aWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwbG9hZC5oJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBsb2FkLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDA2MjExMDUzMzMtcGFweWNwanIzc21za3l4dgorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvZGljdDBsb2FkLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA2MjIwNzU4MjItMzNsZTk0MHAzZWs4cnA0NgpAQCAtMTA5LDcgKzEwOSw4IEBAIGRpY3Rf
bG9hZF9jb2x1bW5fbG93KAogCQkJCQlhIFNZU19DT0xVTU5TIHJlY29yZCAqLwogCW1lbV9oZWFw
X3QqCWhlYXAsCQkvKiE8IGluL291dDogbWVtb3J5IGhlYXAKIAkJCQkJZm9yIHRlbXBvcmFyeSBz
dG9yYWdlICovCi0JZGljdF9jb2xfdCoJY29sdW1uLAkJLyohPCBvdXQ6IGRpY3RfY29sdW1uX3Qg
dG8gZmlsbCAqLworCWRpY3RfY29sX3QqCWNvbHVtbiwJCS8qITwgb3V0OiBkaWN0X2NvbHVtbl90
IHRvIGZpbGwsCisJCQkJCW9yIE5VTEwgaWYgdGFibGUgIT0gTlVMTCAqLwogCWR1bGludCoJCXRh
YmxlX2lkLAkvKiE8IG91dDogdGFibGUgaWQgKi8KIAljb25zdCBjaGFyKioJY29sX25hbWUsCS8q
ITwgb3V0OiBjb2x1bW4gbmFtZSAqLwogCWNvbnN0IHJlY190KglyZWMpOwkJLyohPCBpbjogU1lT
X0NPTFVNTlMgcmVjb3JkICovCgo=

--===============0438668205==
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: 5556531d7c54660dafb0011ef0c5d832c7c1bb0c
# timestamp: 2010-06-22 10:58:34 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   papycpjr3smskyxv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQxgilwAAoPflCAwc3f//1Mv
AyC//9/8BAAIAFAE+Em8CscppUN2uEkoU8aj0lPyZGEJmk9U8p4p6j0geoBoxAJJSemgZJ6o2mkD
RoANAAAAAEiiYppqbETRppinqYNEekZDagYmgZBzTEyZNGEwTE0wCYBDBGBGASSBBqZMmmQJNpPS
eo2U0AAABkMFBWECwii+oxkckOMlHVvvxcKf3v7dBue9YtWjPqsSV0NVeuVdWHDPBOHyO5vBtNJe
XDbG0d/0DNVRlsMclbzxi4VOZFwYTb9PLZ05/YeRl9PrMipnj55jwlh4jsN6BmqlFcZ7oBIjyS6j
auXRr5266aOQlO0CLFlVChAvRj82e32q10aukWExwHEJ+isVP7QsAPAXIWacTn79HBbZadUb6U8S
xwLhghbDobCskyOMkQJmMzMhb+JC5BRkZJX7OueIdfUUimLKhTJTYDJeuDINNQOAnGfcLOKgF9bU
2XOFj2YUK2NjXF0ay6NUiAWFjPorFgo7YQvfe/XdNTdjCszDfMZHcLliZ7olgwp5y5astu7BNSS6
LgHSQqqIAS0g5tgDAQpfPcQrcUpjOLXfXFGziwzfARV0GJaWZ7StylGh4btK0gQI6HTE8dhXEVz8
xuAzAaFVnq/NDlFqwJkAeUl2seWjXwLErxsongWApkCDp5rzdrh+5STHSFtTGT6yQpgZbLxayApj
ZPZ6MimZXVdREMGAa2sxsXgSuiF4qSh+dPtC1zsL2FLURApFO+OJTjJVzq2NYUwIE8hrWFZYXisH
Aa0iJQRRVqjVZK3QQ0bwLICrJ3jd7VvFiA/GlxmLFOe3lLqs0AsfDVjzb0KYkRiqQB4HJURTA7xW
H3NyzQG7brweIZsI6eY69V4vPShVloxt+EPKYj5/rIfmIR/YYOicRhUHdtwYL/5mXA1wwhe3FohD
ducQhWBkjOwTFwmOJrLJELPr3vRPz9glm+KUxyfkpkQ5C7yofE9Ssl5SJKho+bxV8ThyhLOQudkJ
FTOju7OkQyeIT2y94qqzOl2igK7WRkTPN6LdLbEoL6bDDqQBlEp+qcku7dg+9haC27SVbtQ+IhqD
HocEOdxKh5dETynQVqlM8tAvNHaw1pcrdymhngsWHfAdPJ3BMgM8SOzr7pAddR2DpNNnRJI8Z5Cw
58dtNhvondQ3bjlv9IF8MbO8YDqhWtQq5lAFU1lnq04nEqJc0iInxhiFxK2NxlFdXpUq6eBwLw0s
bd7aRNFn2KhbBaZVga36lSVZJLlYhtEuNx3UKIESHYupFtVGOajsy4mDYifVuiG53qOeyUTVgXIX
jYi0S0TKYkByHODkMhdrb1vGMwk47AGLBjGjgK0nSppTZJX2oWoPidqYdtwVxbC42TglGK9uKooV
CObOC0piBBuXVVMUNrYYJOYGXXw6hkLUlwpfpqSQzUi5vPDxPsJTRZYovTLRpLKs/J+W8CIEsVtc
MElXkVVnVA4aUpnTHjPBOKQc/LJKnNhU6TmJRWXG606AKHvEwmzRdA0WKjVQxJUrK26qcTUiolCY
xTGtwqCLOQ8bvDScxqY0RzRDohhfttISK0Vg4U8wP0Klfkw4EqBVXxNRiSgrkZHVydzsLOoLCpNq
aqkJHeTf4p6/8XckU4UJAMYIpcA=


--===============0438668205==--