From: marko.makela
Date: May 3 2010 12:29pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3436) Bug#53248
List-Archive: http://lists.mysql.com/commits/107197
X-Bug: 53248
Message-Id: <201005031229.o43CTEED012762@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0809271558=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDQzMDEwMDIzNi05bmNsZGp4
cGkxNGVjN2VsCgogMzQzNiBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTAzCiAgICAgIGJ1Zl96aXBf
ZGVjb21wcmVzcygpOiBBbGxvdyBCVUZfTk9fQ0hFQ0tTVU1fTUFHSUMgYXMgdGhlIHN0YW1wZWQg
Y2hlY2tzdW0uCiAgICAgIGJ1Zl9wYWdlX2dldF9nZW4oKTogQXNzZXJ0IHRoYXQgYnVmX3ppcF9k
ZWNvbXByZXNzKCkgc3VjY2VlZHMuCiAgICAgIENhbGxlcnMgYXJlIG5vdCBwcmVwYXJlZCBmb3Ig
YSBOVUxMIHJldHVybiB2YWx1ZS4gKEJ1ZyAjNTMyNDgpCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L2J1Zi9idWYwYnVmLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9D
aGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJMjAxMC0wNC0y
OSAxMzozNzo1MCArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCTIw
MTAtMDUtMDMgMTI6Mjg6NTkgKzAwMDAKQEAgLTEsMyArMSw5IEBACisyMDEwLTA1LTAzCVRoZSBJ
bm5vREIgVGVhbQorCisJKiBidWYwYnVmLmM6CisJRml4IEJ1ZyM1MzI0OCBjb21wcmVzc2VkIHRh
YmxlcyBwYWdlIGNoZWNrc3VtIG1pc21hdGNoIGFmdGVyCisJcmUtZW5hYmxpbmcgaW5ub2RiX2No
ZWNrc3VtcworCiAyMDEwLTA0LTI4CVRoZSBJbm5vREIgVGVhbQogCiAJKiBsb2cvbG9nMHJlY3Yu
aCwgbG9nL2xvZzByZWN2LmM6Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL2J1Zi9idWYwYnVmLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGJ1
Zi5jCTIwMTAtMDMtMjMgMTY6MjA6MzYgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L2J1Zi9idWYwYnVmLmMJMjAxMC0wNS0wMyAxMjoyODo1OSArMDAwMApAQCAtMTgyMCwxNCArMTgy
MCwxNCBAQCBidWZfemlwX2RlY29tcHJlc3MoCiAJYnVmX2Jsb2NrX3QqCWJsb2NrLAkvKiE8IGlu
L291dDogYmxvY2sgKi8KIAlpYm9vbAkJY2hlY2spCS8qITwgaW46IFRSVUU9dmVyaWZ5IHRoZSBw
YWdlIGNoZWNrc3VtICovCiB7Ci0JY29uc3QgYnl0ZSogZnJhbWUgPSBibG9jay0+cGFnZS56aXAu
ZGF0YTsKKwljb25zdCBieXRlKglmcmFtZQkJPSBibG9jay0+cGFnZS56aXAuZGF0YTsKKwl1bGlu
dAkJc3RhbXBfY2hlY2tzdW0JPSBtYWNoX3JlYWRfZnJvbV80KAorCQlmcmFtZSArIEZJTF9QQUdF
X1NQQUNFX09SX0NIS1NVTSk7CiAKIAl1dF9hZChidWZfYmxvY2tfZ2V0X3ppcF9zaXplKGJsb2Nr
KSk7CiAJdXRfYShidWZfYmxvY2tfZ2V0X3NwYWNlKGJsb2NrKSAhPSAwKTsKIAotCWlmIChVTklW
X0xJS0VMWShjaGVjaykpIHsKLQkJdWxpbnQJc3RhbXBfY2hlY2tzdW0JPSBtYWNoX3JlYWRfZnJv
bV80KAotCQkJZnJhbWUgKyBGSUxfUEFHRV9TUEFDRV9PUl9DSEtTVU0pOworCWlmIChVTklWX0xJ
S0VMWShjaGVjayAmJiBzdGFtcF9jaGVja3N1bSAhPSBCVUZfTk9fQ0hFQ0tTVU1fTUFHSUMpKSB7
CiAJCXVsaW50CWNhbGNfY2hlY2tzdW0JPSBwYWdlX3ppcF9jYWxjX2NoZWNrc3VtKAogCQkJZnJh
bWUsIHBhZ2VfemlwX2dldF9zaXplKCZibG9jay0+cGFnZS56aXApKTsKIApAQCAtMjI1MSw4ICsy
MjUxLDkgQEAgd2FpdF91bnRpbF91bmZpeGVkOgogCQkvKiBEZWNvbXByZXNzIHRoZSBwYWdlIGFu
ZCBhcHBseSBidWZmZXJlZCBvcGVyYXRpb25zCiAJCXdoaWxlIG5vdCBob2xkaW5nIGJ1Zl9wb29s
X211dGV4IG9yIGJsb2NrLT5tdXRleC4gKi8KIAkJc3VjY2VzcyA9IGJ1Zl96aXBfZGVjb21wcmVz
cyhibG9jaywgc3J2X3VzZV9jaGVja3N1bXMpOworCQl1dF9hKHN1Y2Nlc3MpOwogCi0JCWlmIChV
TklWX0xJS0VMWShzdWNjZXNzICYmICFyZWN2X25vX2lidWZfb3BlcmF0aW9ucykpIHsKKwkJaWYg
KFVOSVZfTElLRUxZKCFyZWN2X25vX2lidWZfb3BlcmF0aW9ucykpIHsKIAkJCWlidWZfbWVyZ2Vf
b3JfZGVsZXRlX2Zvcl9wYWdlKGJsb2NrLCBzcGFjZSwgb2Zmc2V0LAogCQkJCQkJICAgICAgemlw
X3NpemUsIFRSVUUpOwogCQl9CkBAIC0yMjY1LDEzICsyMjY2LDYgQEAgd2FpdF91bnRpbF91bmZp
eGVkOgogCQltdXRleF9leGl0KCZibG9jay0+bXV0ZXgpOwogCQlidWZfcG9vbC0+bl9wZW5kX3Vu
emlwLS07CiAJCXJ3X2xvY2tfeF91bmxvY2soJmJsb2NrLT5sb2NrKTsKLQotCQlpZiAoVU5JVl9V
TkxJS0VMWSghc3VjY2VzcykpIHsKLQotCQkJYnVmX3Bvb2xfbXV0ZXhfZXhpdCgpOwotCQkJcmV0
dXJuKE5VTEwpOwotCQl9Ci0KIAkJYnJlYWs7CiAKIAljYXNlIEJVRl9CTE9DS19aSVBfRlJFRToK
Cg==

--===============0809271558==
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: 272e491f903e564a4281a2e3032ea5861acee726
# timestamp: 2010-05-03 15:29:09 +0300
# base_revision_id: vasil.dimov@stripped\
#   9ncldjxpi14ec7el
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUG1CFIAArTfgEAwe3v//3/v
3yC////4UAXuh7XR0CaxQUdUHcJQkaJoym0pvTQT00U/UG1Rpk9TQND1GGpmUYnqCSUMVMnhT8pG
mmgAADTQAAAAAcZMmhiMTRgEYCYQBgJpo0yNAMMUFPU8o0mnlNAPUaemUAAAADQAAJJBNAExGjU9
EBNPSaNGhohtEBkANF/7QG5SHvbCt+AYVV4KB1T3ba7m7MR2Q71VjbWd3ZKWPN4oyWC3SzC5PJqR
Ngtyi9z2Ktiovek9zGLujhNGSglQVTb4CT1wx4S1xQo9WXA5o3MyxLAKtR58/p7J6v3qs28fVJpw
km3FS4/0FfENnaTQz1i4JnF7WwZ9UWmWEIo2L8J0c9Wb+8zrKOUWzA6CE5K292REGvZXAlJev+RC
kpQPn7IqlvboimBHLfrpxGiNxdaGrVcxYcAjVb8AJ5CP1CdCYrlgrMuaMgOL92Fk+qVlYQzZI0cv
MgZ9prVfGB8EW3BCBNSKRmdfyHNoC4HkAINUCiDWDpi0eiAiAPE9gJxVRZNmdgxUZByL10FItoGo
Q72QRgyFWbVWzNYVvFkmK8oAfK5Pjw/qnLBYxJN1HEyrc2rUOQ7vZsilPE4Y57xDr9NN0D3OQs60
oAfAfM1qzo+PJWTQCQ1DahgJ2IkXi4EyJ6G+KDmOUoMCVuqyDDRViiWMA+6JBTvLh5OnCfnykd4q
hgGAtI5br33GWKOMPOZiRpQuuHBGGMvj7xQSMCBzc6vLzMUVN9a8ZU7jVN43PA6MzsAxLaeA0Biq
cUgHmDikWvK5slMTUmBI5NCjQT8iyYoMaMQxFIsNx44DsZEq8BfLWjPuAjSTWpNeVlQXjiJtw1qk
0dhNK9shOxaQmWTE5MSeMqAKqn3GBGa25zzix76jZYK8CqmidLaBZqjuImRiqvAtq68i1NVZFlSE
JKpE00lA0pI9DM7rLmS52Pv9hrL81QOmF0qN0kKGa1OnodEw9zOycRSlBaigbj4mc7cMiqKorju+
jeB36khH7DBa7wPE1+PCS+YyGhSZHo82EvuWolMB8SmI+4sShwxJiYna2fU3y0k6WEhBXSkrO26e
XoZSg9US6bTnU0upzKy8oqsyFnWbIdLPtVITJq4VjpC9pWdwvAp+Qj6Ou0x9YKicpHXRMBpkSET/
PjsomIqsHBqD1V1IN9aB9KdMxrafyfcLA7j7SRXtPEiQMjQ5TQTEQgRKj51AazGzu+S8ipBh8eL4
N1rscIKeqYRZyrWJWmukhEjYRigTekhjNF3DP49/YYjTLVKXa9EFAFDUhSiN7XeLBu03aGw3FgOI
A6sCzItcXFhgKJAvGgLepLzq+jrPL+ETi/N2+AKLHKNQ2XnyOJQBl6C1VFPQWs8K0yOQo1fXzJws
yGTdWFn01wjrNf6JDF3CJ3JhM3fnlq3Ovxwfk6AO1rnLazDMc08HiKEQmMtFaLi4DkIDbTI3EQmI
hwmVJEl8Sw5kprYOY5OTlz8c8bDTPCBFEiZcG7J0nHIOAvYncvFr3oNgD+lbrWuzeBEyOZZ2rYlE
gs/Kizq0g53bwjGlBRULag6juiVWLYsU3TcB/XMI2I2iJkdZ25qagCwIiJlEYEw4ZWROmR+LmuqT
8UbTUKyClm4NsgT4xugIUGeRDaZxKWK64wLUz1Z2AY3SjZs3vAc+teioPUp0SYeGli8YHDgxTZEP
mCRSBRbYCOEAOgKUL/OaSCxARIFaY2Zgq8AXlQ5drlTdvVlS5memMDwsvec/PzhCugK0f6rs6Yqm
kb3e+rVtdXwcnIDYdIPh6faBr+kHMBgF+r1OL2T6SUhFixhyXTVBAJmIpy174UMYm1vS8nGZ51Ny
NByrU63oHEgd5tJC7q3Z7CpDd/Wh5NYW44U4geHTI3RoOgIW1A6+GeyUgpYttHFFKJguTDmDIqnH
F63npLmLtj0QTWUQv4y1Y34kVRDBFBTavYeHej0L086quQjoxOx47qM7qPfZoJsuM/4u5IpwoSCD
ahCk


--===============0809271558==--