From: marko.makela
Date: May 5 2010 10:05am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3446) Bug#38999
List-Archive: http://lists.mysql.com/commits/107450
X-Bug: 38999
Message-Id: <201005051005.o459fLbf011260@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0287653276=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDUwOTUzMjgtdmV0bmww
ZmxobWhhbzdwNQoKIDM0NDYgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNQogICAgICBBZGQgVmFs
Z3JpbmQgZGlhZ25vc3RpY3MgdG8gdHJhY2sgZG93biBCdWcgIzM4OTk5LgoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBzZWwuYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2VsLmMnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jCTIwMTAtMDQtMjkgMTM6Mjc6NDMgKzAwMDAKKysr
IGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2VsLmMJMjAxMC0wNS0wNSAxMDowNTow
NyArMDAwMApAQCAtMjQ5OCw2ICsyNDk4LDcgQEAgcm93X3NlbF9maWVsZF9zdG9yZV9pbl9teXNx
bF9mb3JtYXQoCiAJYnl0ZSoJcGFkX3B0cjsKIAogCXV0X2FkKGxlbiAhPSBVTklWX1NRTF9OVUxM
KTsKKwlVTklWX01FTV9BU1NFUlRfUlcoZGF0YSwgbGVuKTsKIAogCXN3aXRjaCAodGVtcGwtPnR5
cGUpIHsKIAljYXNlIERBVEFfSU5UOgpAQCAtMjc0Niw2ICsyNzQ3LDkgQEAgcm93X3NlbF9zdG9y
ZV9teXNxbF9yZWMoCiAJCQkvKiBNeVNRTCBhc3N1bWVzIHRoYXQgdGhlIGZpZWxkIGZvciBhbiBT
UUwKIAkJCU5VTEwgdmFsdWUgaXMgc2V0IHRvIHRoZSBkZWZhdWx0IHZhbHVlLiAqLwogCisJCQlV
TklWX01FTV9BU1NFUlRfUlcocHJlYnVpbHQtPmRlZmF1bHRfcmVjCisJCQkJCSAgICsgdGVtcGwt
Pm15c3FsX2NvbF9vZmZzZXQsCisJCQkJCSAgIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsKIAkJCW15
c3FsX3JlY1t0ZW1wbC0+bXlzcWxfbnVsbF9ieXRlX29mZnNldF0KIAkJCQl8PSAoYnl0ZSkgdGVt
cGwtPm15c3FsX251bGxfYml0X21hc2s7CiAJCQltZW1jcHkobXlzcWxfcmVjICsgdGVtcGwtPm15
c3FsX2NvbF9vZmZzZXQsCkBAIC0zMDcwLDYgKzMwNzQsMTEgQEAgcm93X3NlbF9wb3BfY2FjaGVk
X3Jvd19mb3JfbXlzcWwoCiAKIAkJZm9yIChpID0gMDsgaSA8IHByZWJ1aWx0LT5uX3RlbXBsYXRl
OyBpKyspIHsKIAkJCXRlbXBsID0gcHJlYnVpbHQtPm15c3FsX3RlbXBsYXRlICsgaTsKKyNpZiAw
IC8qIFNvbWUgb2YgdGhlIGNhY2hlZF9yZWMgbWF5IGxlZ2l0aW1hdGVseSBiZSB1bmluaXRpYWxp
emVkLiAqLworCQkJVU5JVl9NRU1fQVNTRVJUX1JXKGNhY2hlZF9yZWMKKwkJCQkJICAgKyB0ZW1w
bC0+bXlzcWxfY29sX29mZnNldCwKKwkJCQkJICAgdGVtcGwtPm15c3FsX2NvbF9sZW4pOworI2Vu
ZGlmCiAJCQl1dF9tZW1jcHkoYnVmICsgdGVtcGwtPm15c3FsX2NvbF9vZmZzZXQsCiAJCQkJICBj
YWNoZWRfcmVjICsgdGVtcGwtPm15c3FsX2NvbF9vZmZzZXQsCiAJCQkJICB0ZW1wbC0+bXlzcWxf
Y29sX2xlbik7CkBAIC0zMDg0LDYgKzMwOTMsMTEgQEAgcm93X3NlbF9wb3BfY2FjaGVkX3Jvd19m
b3JfbXlzcWwoCiAJCX0KIAl9CiAJZWxzZSB7CisjaWYgMCAvKiBTb21lIG9mIHRoZSBjYWNoZWRf
cmVjIG1heSBsZWdpdGltYXRlbHkgYmUgdW5pbml0aWFsaXplZC4gKi8KKwkJVU5JVl9NRU1fQVNT
RVJUX1JXKHByZWJ1aWx0LT5mZXRjaF9jYWNoZQorCQkJCSAgIFtwcmVidWlsdC0+ZmV0Y2hfY2Fj
aGVfZmlyc3RdLAorCQkJCSAgIHByZWJ1aWx0LT5teXNxbF9wcmVmaXhfbGVuKTsKKyNlbmRpZgog
CQl1dF9tZW1jcHkoYnVmLAogCQkJICBwcmVidWlsdC0+ZmV0Y2hfY2FjaGVbcHJlYnVpbHQtPmZl
dGNoX2NhY2hlX2ZpcnN0XSwKIAkJCSAgcHJlYnVpbHQtPm15c3FsX3ByZWZpeF9sZW4pOwpAQCAt
MzEzNCw2ICszMTQ4LDggQEAgcm93X3NlbF9wdXNoX2NhY2hlX3Jvd19mb3JfbXlzcWwoCiAJfQog
CiAJdXRfYWQocHJlYnVpbHQtPmZldGNoX2NhY2hlX2ZpcnN0ID09IDApOworCVVOSVZfTUVNX0lO
VkFMSUQocHJlYnVpbHQtPmZldGNoX2NhY2hlW3ByZWJ1aWx0LT5uX2ZldGNoX2NhY2hlZF0sCisJ
CQkgcHJlYnVpbHQtPm15c3FsX3Jvd19sZW4pOwogCiAJaWYgKFVOSVZfVU5MSUtFTFkoIXJvd19z
ZWxfc3RvcmVfbXlzcWxfcmVjKAogCQkJCSAgcHJlYnVpbHQtPmZldGNoX2NhY2hlWwoK

--===============0287653276==
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: bbea683ca219b52b52f279d917111168dda755be
# timestamp: 2010-05-05 13:05:16 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   vetnl0flhmhao7p5
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYWBpqwAAhpfgGAwW3///3cn
H4q////wUATPczOppLAZTbbSEkknqaZMVPamyajaMhqnieqGQGIB6mnppA0EkhMjQ0JopsFGjQNA
AD0jQaB6gBqniRMgA0AGjQAAAAGg0AOMmTTTCZGQMCMTRgjCDRpgAEEkiaAI00Mk1P0jE1PUNqZM
nplDTIANDRxPSOEh6BkzDMN3ZO0ZUVNmqrz67T4jO77STU80kaoGVbY74PiBSQme6rISYsNpaMXC
7q69REUmcyhtCIgs9xWfU0J8xdFANoa5SCI0CLsGzPdHGN9DgYU8ijkhRIKskGjAfNp05ZBBbBhA
Q8xmQ45RM4g+TkdosdSTc+aARec3nDAozl3eOHgMx2S2I9Q8O/cNx0KCMR4KgW1dTwyAyhlWffRy
wLeV1yyyK1mQahDukpI2LvRJxRPO1EiTmBmZmcV4H6noCJwjWnkIICCC16cKV8GHg4yDdHBWLUqk
T0O6aKYhFIuQ59BrlFQI6LZWSt7B0D38FSh5NNTvNYQWRuOMsntzciQ3EYxlcgWlD3krk/KZ6FMR
Bdtb3IgZjEKcWSqgi4GZTvWoWGkxJR1QWbiuikWjxh0r+va8ZrdpIIlkBq3RidZWEj9Yk79eo91V
6wSW9kHvwxhkqtpaOWGgzEZEpirVRJpdJCpsypK15lMaozGdAv6SsRNmk2kdBSM+jB2YxtWtZLed
9ZRwKZ7FBYtoTqrx2okUMjRhCZOu6JYtN7665jJ3NYs2K4xLCVRC+ZBxUnyGIIZF80O9LNN7TKwr
WKrGpIS6fA2C9iBtm4v7IHuMMDoK0jKtiR4/sJ54UzNwu74O1HIMaOMfgjjFAiaMuKLnhAJhIJH5
DqROtEIA2G7ZijNHEPgHYGeWVnJkP6m/zKE6jvlhojTw2mlMcpGkZ+3ypOpLZ52EWYRwcPBIsten
FkLArnFdMhVMb2N+FPN5wIyYuHWHWnGg7sGaNK8XvcdfrAcOK1dWcF2I4m4PGstVijPkLywFPKHN
250DmENUFiRU+mWZY8YD05NAUQbzFYd3mMK6/jxskVdRoHYqNi6NhnHJGEn3DadW7BunPEzauZsJ
gIA7vNyR6TTQQDvha0x5+pMkVCejwIcqZEk8crXhzleNQVgTqcCVQkDLoJFluOkoEypIXFKmNa3y
Ehw33D44lVoesZp3X7hYYh3lby0G3MKwG0JtIxMwViiTCpSe7S4sMmd+YTEDUMZrgtSgGafWFVJy
HRfFJlAouAlNZdgfSs81SxK/WL9WJHQEKRbtBl1viUqgC4GHpFkohlQsYRTplW9LY7LiiMaRR1CO
a+44Dk1KlJywwKt9Rzq6cpOLw2U5xWe2uKGUGClDy21okRc/XlHjLYnX6c80TJmQydsjYRMpKqi8
zpLvGnA24US+4RIEq2OUnNCl03da0TlttijeRgwSc968oxqrbRuE6Jatm40NpiJdrFK5DSFd4sKM
nzls6q0i1VXR0B5I2v0RkjEi2ieuaKIZsh2K/mIOJycBpFRmSicrXVoxevAlmzynK/1EIRB7zkC+
TiTE8Cy4cQJpoBJOa5MRZRcbuG9LOlhFTYVSVi7yp26AYRc/S4r2C3xqUpwmRzNbQk0UwXPlx/8X
ckU4UJCFgaas


--===============0287653276==--