From: marko.makela
Date: May 5 2010 9:55am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3444 to 3445) Bug#38999
List-Archive: http://lists.mysql.com/commits/107441
X-Bug: 38999
Message-Id: <201005050955.o459tIR6014914@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0651876382=="

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

IDM0NDUgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICBBZGQgVmFsZ3JpbmQgZGlhZ25v
c3RpY3MgdG8gdHJhY2sgZG93biBCdWcgIzM4OTk5LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9y
YWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMKIDM0NDQgSmltbXkgWWFuZwkyMDEwLTA1LTA0CiAg
ICAgIFBvcnQgZml4IGZvciA1MzE2NSB0byBJbm5vREIgNS4xIHBsdWdpbi4gVGhlIGNoYW5nZSBi
dWZmZXJpbmcgb3B0aW9ucwogICAgICBhcmUgZGlmZmVyZW50IGluIDUuMSBjb21wYXJpbmcgdG8g
dGhhdCBvZiA1LjUsIHNvIGEgaGFuZCBwb3J0IGlzCiAgICAgIG5lY2Vzc2FyeSB0byBhdm9pZCB3
cm9uZyBkZWZhdWx0IG9wdGlvbiB0byBiZSBzZXQgYnkgYSBzaW1wbGUKICAgICAgYnJhbmNoIG1l
cmdlLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9o
YV9pbm5vZGIuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBz
ZWwuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCTIwMTAtMDQtMjkgMTM6
Mjk6NDUgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCTIwMTAtMDUt
MDUgMDk6NTM6MjggKzAwMDAKQEAgLTI0NTIsNiArMjQ1Miw3IEBAIHJvd19zZWxfZmllbGRfc3Rv
cmVfaW5fbXlzcWxfZm9ybWF0KAogCWJ5dGUqCXBhZF9wdHI7CiAKIAl1dF9hZChsZW4gIT0gVU5J
Vl9TUUxfTlVMTCk7CisJVU5JVl9NRU1fQVNTRVJUX1JXKGRhdGEsIGxlbik7CiAKIAlpZiAodGVt
cGwtPnR5cGUgPT0gREFUQV9JTlQpIHsKIAkJLyogQ29udmVydCBpbnRlZ2VyIGRhdGEgZnJvbSBJ
bm5vYmFzZSB0byBhIGxpdHRsZS1lbmRpYW4KQEAgLTI2ODcsNiArMjY4OCw5IEBAIHJvd19zZWxf
c3RvcmVfbXlzcWxfcmVjKAogCQkJLyogTXlTUUwgYXNzdW1lcyB0aGF0IHRoZSBmaWVsZCBmb3Ig
YW4gU1FMCiAJCQlOVUxMIHZhbHVlIGlzIHNldCB0byB0aGUgZGVmYXVsdCB2YWx1ZS4gKi8KIAor
CQkJVU5JVl9NRU1fQVNTRVJUX1JXKHByZWJ1aWx0LT5kZWZhdWx0X3JlYworCQkJCQkgICArIHRl
bXBsLT5teXNxbF9jb2xfb2Zmc2V0LAorCQkJCQkgICB0ZW1wbC0+bXlzcWxfY29sX2xlbik7CiAJ
CQlteXNxbF9yZWNbdGVtcGwtPm15c3FsX251bGxfYnl0ZV9vZmZzZXRdCiAJCQkJfD0gKGJ5dGUp
IHRlbXBsLT5teXNxbF9udWxsX2JpdF9tYXNrOwogCQkJbWVtY3B5KG15c3FsX3JlYyArIHRlbXBs
LT5teXNxbF9jb2xfb2Zmc2V0LApAQCAtMzAwNyw2ICszMDExLDExIEBAIHJvd19zZWxfcG9wX2Nh
Y2hlZF9yb3dfZm9yX215c3FsKAogCiAJCWZvciAoaSA9IDA7IGkgPCBwcmVidWlsdC0+bl90ZW1w
bGF0ZTsgaSsrKSB7CiAJCQl0ZW1wbCA9IHByZWJ1aWx0LT5teXNxbF90ZW1wbGF0ZSArIGk7Cisj
aWYgMCAvKiBTb21lIG9mIHRoZSBjYWNoZWRfcmVjIG1heSBsZWdpdGltYXRlbHkgYmUgdW5pbml0
aWFsaXplZC4gKi8KKwkJCVVOSVZfTUVNX0FTU0VSVF9SVyhjYWNoZWRfcmVjCisJCQkJCSAgICsg
dGVtcGwtPm15c3FsX2NvbF9vZmZzZXQsCisJCQkJCSAgIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsK
KyNlbmRpZgogCQkJdXRfbWVtY3B5KGJ1ZiArIHRlbXBsLT5teXNxbF9jb2xfb2Zmc2V0LAogCQkJ
CSAgY2FjaGVkX3JlYyArIHRlbXBsLT5teXNxbF9jb2xfb2Zmc2V0LAogCQkJCSAgdGVtcGwtPm15
c3FsX2NvbF9sZW4pOwpAQCAtMzAyMSw2ICszMDMwLDExIEBAIHJvd19zZWxfcG9wX2NhY2hlZF9y
b3dfZm9yX215c3FsKAogCQl9CiAJfQogCWVsc2UgeworI2lmIDAgLyogU29tZSBvZiB0aGUgY2Fj
aGVkX3JlYyBtYXkgbGVnaXRpbWF0ZWx5IGJlIHVuaW5pdGlhbGl6ZWQuICovCisJCVVOSVZfTUVN
X0FTU0VSVF9SVyhwcmVidWlsdC0+ZmV0Y2hfY2FjaGUKKwkJCQkgICBbcHJlYnVpbHQtPmZldGNo
X2NhY2hlX2ZpcnN0XSwKKwkJCQkgICBwcmVidWlsdC0+bXlzcWxfcHJlZml4X2xlbik7CisjZW5k
aWYKIAkJdXRfbWVtY3B5KGJ1ZiwKIAkJCSAgcHJlYnVpbHQtPmZldGNoX2NhY2hlW3ByZWJ1aWx0
LT5mZXRjaF9jYWNoZV9maXJzdF0sCiAJCQkgIHByZWJ1aWx0LT5teXNxbF9wcmVmaXhfbGVuKTsK
QEAgLTMwNzAsNiArMzA4NCw4IEBAIHJvd19zZWxfcHVzaF9jYWNoZV9yb3dfZm9yX215c3FsKAog
CX0KIAogCXV0X2FkKHByZWJ1aWx0LT5mZXRjaF9jYWNoZV9maXJzdCA9PSAwKTsKKwlVTklWX01F
TV9JTlZBTElEKHByZWJ1aWx0LT5mZXRjaF9jYWNoZVtwcmVidWlsdC0+bl9mZXRjaF9jYWNoZWRd
LAorCQkJIHByZWJ1aWx0LT5teXNxbF9yb3dfbGVuKTsKIAogCWlmIChVTklWX1VOTElLRUxZKCFy
b3dfc2VsX3N0b3JlX215c3FsX3JlYygKIAkJCQkgIHByZWJ1aWx0LT5mZXRjaF9jYWNoZVsKCg==

--===============0651876382==
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:55:14 +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=


--===============0651876382==--