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

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUuY29tLTIwMTAwNTA1MDQ1MjI0LTkwMjJ1eW4y
bW9pZnAwc3AKCiAzNDQ1IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMDUKICAgICAgQWRkIFZhbGdy
aW5kIGRpYWdub3N0aWNzIHRvIHRyYWNrIGRvd24gQnVnICMzODk5OS4KCiAgICBtb2RpZmllZDoK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93
L3JvdzBzZWwuYwkyMDEwLTA0LTI5IDEzOjI5OjQ1ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2Jh
c2Uvcm93L3JvdzBzZWwuYwkyMDEwLTA1LTA1IDA5OjUzOjI4ICswMDAwCkBAIC0yNDUyLDYgKzI0
NTIsNyBAQCByb3dfc2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdCgKIAlieXRlKglwYWRf
cHRyOwogCiAJdXRfYWQobGVuICE9IFVOSVZfU1FMX05VTEwpOworCVVOSVZfTUVNX0FTU0VSVF9S
VyhkYXRhLCBsZW4pOwogCiAJaWYgKHRlbXBsLT50eXBlID09IERBVEFfSU5UKSB7CiAJCS8qIENv
bnZlcnQgaW50ZWdlciBkYXRhIGZyb20gSW5ub2Jhc2UgdG8gYSBsaXR0bGUtZW5kaWFuCkBAIC0y
Njg3LDYgKzI2ODgsOSBAQCByb3dfc2VsX3N0b3JlX215c3FsX3JlYygKIAkJCS8qIE15U1FMIGFz
c3VtZXMgdGhhdCB0aGUgZmllbGQgZm9yIGFuIFNRTAogCQkJTlVMTCB2YWx1ZSBpcyBzZXQgdG8g
dGhlIGRlZmF1bHQgdmFsdWUuICovCiAKKwkJCVVOSVZfTUVNX0FTU0VSVF9SVyhwcmVidWlsdC0+
ZGVmYXVsdF9yZWMKKwkJCQkJICAgKyB0ZW1wbC0+bXlzcWxfY29sX29mZnNldCwKKwkJCQkJICAg
dGVtcGwtPm15c3FsX2NvbF9sZW4pOwogCQkJbXlzcWxfcmVjW3RlbXBsLT5teXNxbF9udWxsX2J5
dGVfb2Zmc2V0XQogCQkJCXw9IChieXRlKSB0ZW1wbC0+bXlzcWxfbnVsbF9iaXRfbWFzazsKIAkJ
CW1lbWNweShteXNxbF9yZWMgKyB0ZW1wbC0+bXlzcWxfY29sX29mZnNldCwKQEAgLTMwMDcsNiAr
MzAxMSwxMSBAQCByb3dfc2VsX3BvcF9jYWNoZWRfcm93X2Zvcl9teXNxbCgKIAogCQlmb3IgKGkg
PSAwOyBpIDwgcHJlYnVpbHQtPm5fdGVtcGxhdGU7IGkrKykgewogCQkJdGVtcGwgPSBwcmVidWls
dC0+bXlzcWxfdGVtcGxhdGUgKyBpOworI2lmIDAgLyogU29tZSBvZiB0aGUgY2FjaGVkX3JlYyBt
YXkgbGVnaXRpbWF0ZWx5IGJlIHVuaW5pdGlhbGl6ZWQuICovCisJCQlVTklWX01FTV9BU1NFUlRf
UlcoY2FjaGVkX3JlYworCQkJCQkgICArIHRlbXBsLT5teXNxbF9jb2xfb2Zmc2V0LAorCQkJCQkg
ICB0ZW1wbC0+bXlzcWxfY29sX2xlbik7CisjZW5kaWYKIAkJCXV0X21lbWNweShidWYgKyB0ZW1w
bC0+bXlzcWxfY29sX29mZnNldCwKIAkJCQkgIGNhY2hlZF9yZWMgKyB0ZW1wbC0+bXlzcWxfY29s
X29mZnNldCwKIAkJCQkgIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsKQEAgLTMwMjEsNiArMzAzMCwx
MSBAQCByb3dfc2VsX3BvcF9jYWNoZWRfcm93X2Zvcl9teXNxbCgKIAkJfQogCX0KIAllbHNlIHsK
KyNpZiAwIC8qIFNvbWUgb2YgdGhlIGNhY2hlZF9yZWMgbWF5IGxlZ2l0aW1hdGVseSBiZSB1bmlu
aXRpYWxpemVkLiAqLworCQlVTklWX01FTV9BU1NFUlRfUlcocHJlYnVpbHQtPmZldGNoX2NhY2hl
CisJCQkJICAgW3ByZWJ1aWx0LT5mZXRjaF9jYWNoZV9maXJzdF0sCisJCQkJICAgcHJlYnVpbHQt
Pm15c3FsX3ByZWZpeF9sZW4pOworI2VuZGlmCiAJCXV0X21lbWNweShidWYsCiAJCQkgIHByZWJ1
aWx0LT5mZXRjaF9jYWNoZVtwcmVidWlsdC0+ZmV0Y2hfY2FjaGVfZmlyc3RdLAogCQkJICBwcmVi
dWlsdC0+bXlzcWxfcHJlZml4X2xlbik7CkBAIC0zMDcwLDYgKzMwODQsOCBAQCByb3dfc2VsX3B1
c2hfY2FjaGVfcm93X2Zvcl9teXNxbCgKIAl9CiAKIAl1dF9hZChwcmVidWlsdC0+ZmV0Y2hfY2Fj
aGVfZmlyc3QgPT0gMCk7CisJVU5JVl9NRU1fSU5WQUxJRChwcmVidWlsdC0+ZmV0Y2hfY2FjaGVb
cHJlYnVpbHQtPm5fZmV0Y2hfY2FjaGVkXSwKKwkJCSBwcmVidWlsdC0+bXlzcWxfcm93X2xlbik7
CiAKIAlpZiAoVU5JVl9VTkxJS0VMWSghcm93X3NlbF9zdG9yZV9teXNxbF9yZWMoCiAJCQkJICBw
cmVidWlsdC0+ZmV0Y2hfY2FjaGVbCgo=

--===============1692197723==
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: ac6f59fdbdc0700c8ee7eeb381f1ecd3767c1a25
# timestamp: 2010-05-05 12:53:36 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: jimmy.yang@stripped\
#   9022uyn2moifp0sp
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWU663vYAAh5fgGAwW3///3cn
H4q////wUAT4SeK6bWB21trmzCSk1Mg9Keo0zTSD2pHqeU/VBoAMgAGgAklT0m1H6KNRpkaaNNAa
AAAAGgBoJFNEEjE9JtJiMKYhpoAD1NDQ0GQBxkyaaYTIyBgRiaMEYQaNMAAgkkjCGhMVT/KmyNKf
lR+hPSR+lG1P1T01DTEDQepIuYkTQNNjY92P3DXDmd+bQd7Ye8cuzUb22hBRWjWJ7dM4mCr2TiK+
GkqSvLxmYXww1bSZaaDIXQ2xdnWu2duUnouoXPJSUnR55c9C2Kb2flOvJ/TYVT7InK8m4Nt5KKjt
lbyyzsg8JIgZ3Y7DP26tMYj+ccBm4wIop2oOAv1haVw0Z/mTzGMOut6OIjD1gM951BWnCGrAmhMD
F8J8cMFGi+LdGubryp7GIMiUVigTlrOKde5G946gVccCiWF0mkdMhDxJnEqe5O1XjUkDFzFRZbKd
GLMT8O6Z5WXi5l0LIrjBJeaSjfEWbLnYJpwbRzKvcfkO36Kd3LPmOaoYxq14VpDXr8R8wbWojlML
pkqSmoUVHNiikMu1vJGaiZmJuVinBzDgmwzWpTfTqgYaiJ6iZUrU4poi7bUrEz0wkTVIUHfTGNUw
2GkqKzkr/WgsOLLhszFWVl250bQW1hXjG6Uk+msWopFvLTAeZPzNKH40lVxUTxOWBylQWYRNWUlN
VQLyl125oxie47NETk01s6oQKDYQvKnZG9RJUOZNW1Bc6gnEU1FpKrBUECFbPlaUuM0+0mEXr3Id
3s2ngYsLpYn1nVgSOymk+VkPZznR64pIqiUaEjnyp7kxfnuDJksTb+fP9Y9qPcJoyP7IyWYIdFz5
ROAUA4RCJ8B6IewiiYPHyaeBHCjtDqD0hx2WOSaI8z/rVMCq1WU11KA9hvHgenJLh2MIvsHB5+YF
2VCcXPvV6XCwWdYjFjmx48F4rEgvA6T52duiDlxAcOKzP2kPKa5LiHzuKi89p/2Ct6g22bEDmENM
MEidF0sVlrOZmPXAendBI/ArFWGmw91a5XHjlhcbR0t67t5qHJEL1mZFpT6T9dZzKo9TWkx4O7ki
dRQDlsp13jpHx70wExUI94/BMiU4SbEOovxT1gFYqwJJ8QxzMtZsrCWPLa0iIYUqq2OHHlVkJL0o
sT41dUpvWQkW4J4DbGz8cZ18wtYPkE9QzEwsFelPvM2GPhjiEx59QxsXR6g0SgHotc+AXXGw9e2m
OgE+gCRwOimmZeTQYtCtXR3awOMN/KBs29ANdleAWe5TDUDKgNrTEMVCmC9OJipjSqiouXRyRjpw
5UsXibCZjUxiVmof1vPsFZptk9cVVSYBtktXEUudcUN4ph7BhcbcNqLCqUBr0kDXfFLbp12zabQ1
LlqaVoq8OE3GS60l+Y1gHdFH3iJhauxynlBLjtim+IrtRv34lKuRJBWC1f3llkNnzmNqSSu38CvV
CWtUlJDUilv27TKDxwxAdUSruGVGOGnSRYiqywwgM2aca0dIpItLQHWFWBl6VZqe/ajHC6UrnBi5
I6ic6giDMLouIsV6iqY4pKxNSEU5ppiDL7o0G7y6Us76yCs712TXaLDhgBiLh4OMaVAncZyVDm9i
7Vrek0LIYIPd/xdyRThQkE663vY=


--===============1692197723==--