From: marko.makela
Date: February 2 2011 12:12pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3699) Bug#55284
List-Archive: http://lists.mysql.com/commits/130214
X-Bug: 55284
Message-Id: <201102021213.p12B6kgw006090@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1677077073=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIwMjEyMTAxMi1icXBx
NzEycncxNjl6a2IzCgogMzY5OSBNYXJrbyBNw6RrZWzDpAkyMDExLTAyLTAyCiAgICAgIE5vbi1m
dW5jdGlvbmFsIGNoYW5nZXMgKGNsZWFudXApIG1hZGUgd2hpbGUgbmFycm93aW5nIGRvd24gQnVn
ICM1NTI4NDoKICAgICAgCiAgICAgIHJvd19wdXJnZSgpOiBDaGFuZ2UgdGhlIHJldHVybiB0eXBl
IHRvIHZvaWQuIChUaGUgcmV0dXJuIHZhbHVlIGFsd2F5cwogICAgICB3YXMgREJfU1VDQ0VTUy4p
IFJlbW92ZSBzb21lIGxvY2FsIHZhcmlhYmxlcy4KICAgICAgCiAgICAgIHJvd191bmRvX21vZF9y
ZW1vdmVfY2x1c3RfbG93KCk6IFJlbW92ZSBzb21lIGxvY2FsIHZhcmlhYmxlcy4KICAgICAgCiAg
ICAgIHJiOi8vNTQ3IGFwcHJvdmVkIGJ5IEppbW15IFlhbmcKCiAgICBtb2RpZmllZDoKICAgICAg
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwcHVyZ2UuYwogICAgICBzdG9yYWdlL2lubm9k
Yl9wbHVnaW4vcm93L3JvdzB1bW9kLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9yb3cvcm93MHB1cmdlLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cv
cm93MHB1cmdlLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMDIxMjEwMTIt
YnFwcTcxMnJ3MTY5emtiMworKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBwdXJn
ZS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjAyMTIxMjQ5LWxmaDFtaWhm
ODcyNXZ2eDcKQEAgLTYxMyw0NyArNjEzLDMyIEBAIGVycl9leGl0OgogLyoqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogRmV0Y2hl
cyBhbiB1bmRvIGxvZyByZWNvcmQgYW5kIGRvZXMgdGhlIHB1cmdlIGZvciB0aGUgcmVjb3JkZWQg
b3BlcmF0aW9uLgogSWYgbm9uZSBsZWZ0LCBvciB0aGUgY3VycmVudCBwdXJnZSBjb21wbGV0ZWQs
IHJldHVybnMgdGhlIGNvbnRyb2wgdG8gdGhlCi1wYXJlbnQgbm9kZSwgd2hpY2ggaXMgYWx3YXlz
IGEgcXVlcnkgdGhyZWFkIG5vZGUuCi1AcmV0dXJuCURCX1NVQ0NFU1MgaWYgb3BlcmF0aW9uIHN1
Y2Nlc3NmdWxseSBjb21wbGV0ZWQsIGVsc2UgZXJyb3IgY29kZSAqLwotc3RhdGljCi11bGludAor
cGFyZW50IG5vZGUsIHdoaWNoIGlzIGFsd2F5cyBhIHF1ZXJ5IHRocmVhZCBub2RlLiAqLworc3Rh
dGljIF9fYXR0cmlidXRlX18oKG5vbm51bGwpKQordm9pZAogcm93X3B1cmdlKAogLyo9PT09PT0q
LwogCXB1cmdlX25vZGVfdCoJbm9kZSwJLyohPCBpbjogcm93IHB1cmdlIG5vZGUgKi8KIAlxdWVf
dGhyX3QqCXRocikJLyohPCBpbjogcXVlcnkgdGhyZWFkICovCiB7Ci0Jcm9sbF9wdHJfdAlyb2xs
X3B0cjsKLQlpYm9vbAkJcHVyZ2VfbmVlZGVkOwogCWlib29sCQl1cGRhdGVkX2V4dGVybjsKLQl0
cnhfdCoJCXRyeDsKIAotCXV0X2FkKG5vZGUgJiYgdGhyKTsKLQotCXRyeCA9IHRocl9nZXRfdHJ4
KHRocik7CisJdXRfYWQobm9kZSk7CisJdXRfYWQodGhyKTsKIAotCW5vZGUtPnVuZG9fcmVjID0g
dHJ4X3B1cmdlX2ZldGNoX25leHRfcmVjKCZyb2xsX3B0ciwKLQkJCQkJCSAgJihub2RlLT5yZXNl
cnZhdGlvbiksCisJbm9kZS0+dW5kb19yZWMgPSB0cnhfcHVyZ2VfZmV0Y2hfbmV4dF9yZWMoJm5v
ZGUtPnJvbGxfcHRyLAorCQkJCQkJICAmbm9kZS0+cmVzZXJ2YXRpb24sCiAJCQkJCQkgIG5vZGUt
PmhlYXApOwogCWlmICghbm9kZS0+dW5kb19yZWMpIHsKIAkJLyogUHVyZ2UgY29tcGxldGVkIGZv
ciB0aGlzIHF1ZXJ5IHRocmVhZCAqLwogCiAJCXRoci0+cnVuX25vZGUgPSBxdWVfbm9kZV9nZXRf
cGFyZW50KG5vZGUpOwogCi0JCXJldHVybihEQl9TVUNDRVNTKTsKKwkJcmV0dXJuOwogCX0KIAot
CW5vZGUtPnJvbGxfcHRyID0gcm9sbF9wdHI7Ci0KLQlpZiAobm9kZS0+dW5kb19yZWMgPT0gJnRy
eF9wdXJnZV9kdW1teV9yZWMpIHsKLQkJcHVyZ2VfbmVlZGVkID0gRkFMU0U7Ci0JfSBlbHNlIHsK
LQkJcHVyZ2VfbmVlZGVkID0gcm93X3B1cmdlX3BhcnNlX3VuZG9fcmVjKG5vZGUsICZ1cGRhdGVk
X2V4dGVybiwKLQkJCQkJCQl0aHIpOwotCQkvKiBJZiBwdXJnZV9uZWVkZWQgPT0gVFJVRSwgd2Ug
bXVzdCBhbHNvIHJlbWVtYmVyIHRvIHVuZnJlZXplCi0JCWRhdGEgZGljdGlvbmFyeSEgKi8KLQl9
Ci0KLQlpZiAocHVyZ2VfbmVlZGVkKSB7CisJaWYgKG5vZGUtPnVuZG9fcmVjICE9ICZ0cnhfcHVy
Z2VfZHVtbXlfcmVjCisJICAgICYmIHJvd19wdXJnZV9wYXJzZV91bmRvX3JlYyhub2RlLCAmdXBk
YXRlZF9leHRlcm4sIHRocikpIHsKIAkJbm9kZS0+Zm91bmRfY2x1c3QgPSBGQUxTRTsKIAogCQlu
b2RlLT5pbmRleCA9IGRpY3RfdGFibGVfZ2V0X25leHRfaW5kZXgoCkBAIC02NzIsNyArNjU3LDcg
QEAgcm93X3B1cmdlKAogCQkJYnRyX3BjdXJfY2xvc2UoJihub2RlLT5wY3VyKSk7CiAJCX0KIAot
CQlyb3dfbXlzcWxfdW5mcmVlemVfZGF0YV9kaWN0aW9uYXJ5KHRyeCk7CisJCXJvd19teXNxbF91
bmZyZWV6ZV9kYXRhX2RpY3Rpb25hcnkodGhyX2dldF90cngodGhyKSk7CiAJfQogCiAJLyogRG8g
c29tZSBjbGVhbnVwICovCkBAIC02ODAsOCArNjY1LDYgQEAgcm93X3B1cmdlKAogCW1lbV9oZWFw
X2VtcHR5KG5vZGUtPmhlYXApOwogCiAJdGhyLT5ydW5fbm9kZSA9IG5vZGU7Ci0KLQlyZXR1cm4o
REJfU1VDQ0VTUyk7CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKi8vKioKQEAgLTY5NSw5ICs2NzgsNiBAQCByb3dfcHVyZ2Vf
c3RlcCgKIAlxdWVfdGhyX3QqCXRocikJLyohPCBpbjogcXVlcnkgdGhyZWFkICovCiB7CiAJcHVy
Z2Vfbm9kZV90Kglub2RlOwotI2lmZGVmIFVOSVZfREVCVUcKLQl1bGludAkJZXJyOwotI2VuZGlm
IC8qIFVOSVZfREVCVUcgKi8KIAogCXV0X2FkKHRocik7CiAKQEAgLTcwNSwxMiArNjg1LDcgQEAg
cm93X3B1cmdlX3N0ZXAoCiAKIAl1dF9hZChxdWVfbm9kZV9nZXRfdHlwZShub2RlKSA9PSBRVUVf
Tk9ERV9QVVJHRSk7CiAKLSNpZmRlZiBVTklWX0RFQlVHCi0JZXJyID0KLSNlbmRpZiAvKiBVTklW
X0RFQlVHICovCiAJcm93X3B1cmdlKG5vZGUsIHRocik7CiAKLQl1dF9hZChlcnIgPT0gREJfU1VD
Q0VTUyk7Ci0KIAlyZXR1cm4odGhyKTsKIH0KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vcm93L3JvdzB1bW9kLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9y
b3cvcm93MHVtb2QuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIwMjEyMTAx
Mi1icXBxNzEycncxNjl6a2IzCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHVt
b2QuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIwMjEyMTI0OS1sZmgxbWlo
Zjg3MjV2dng3CkBAIC0xNzMsNDAgKzE3MywyNiBAQCByb3dfdW5kb19tb2RfcmVtb3ZlX2NsdXN0
X2xvdygKIAltdHJfdCoJCW10ciwJLyohPCBpbjogbXRyICovCiAJdWxpbnQJCW1vZGUpCS8qITwg
aW46IEJUUl9NT0RJRllfTEVBRiBvciBCVFJfTU9ESUZZX1RSRUUgKi8KIHsKLQlidHJfcGN1cl90
KglwY3VyOwogCWJ0cl9jdXJfdCoJYnRyX2N1cjsKIAl1bGludAkJZXJyOwotCWlib29sCQlzdWNj
ZXNzOwogCiAJdXRfYWQobm9kZS0+cmVjX3R5cGUgPT0gVFJYX1VORE9fVVBEX0RFTF9SRUMpOwot
CXBjdXIgPSAmKG5vZGUtPnBjdXIpOwotCWJ0cl9jdXIgPSBidHJfcGN1cl9nZXRfYnRyX2N1cihw
Y3VyKTsKIAotCXN1Y2Nlc3MgPSBidHJfcGN1cl9yZXN0b3JlX3Bvc2l0aW9uKG1vZGUsIHBjdXIs
IG10cik7CisJLyogRmluZCBvdXQgaWYgdGhlIHJlY29yZCBoYXMgYmVlbiBwdXJnZWQgYWxyZWFk
eQorCW9yIGlmIHdlIGNhbiByZW1vdmUgaXQuICovCiAKLQlpZiAoIXN1Y2Nlc3MpIHsKKwlpZiAo
IWJ0cl9wY3VyX3Jlc3RvcmVfcG9zaXRpb24obW9kZSwgJm5vZGUtPnBjdXIsIG10cikKKwkgICAg
fHwgcm93X3ZlcnNfbXVzdF9wcmVzZXJ2ZV9kZWxfbWFya2VkKG5vZGUtPm5ld190cnhfaWQsIG10
cikpIHsKIAogCQlyZXR1cm4oREJfU1VDQ0VTUyk7CiAJfQogCi0JLyogRmluZCBvdXQgaWYgd2Ug
Y2FuIHJlbW92ZSB0aGUgd2hvbGUgY2x1c3RlcmVkIGluZGV4IHJlY29yZCAqLwotCi0JaWYgKG5v
ZGUtPnJlY190eXBlID09IFRSWF9VTkRPX1VQRF9ERUxfUkVDCi0JICAgICYmICFyb3dfdmVyc19t
dXN0X3ByZXNlcnZlX2RlbF9tYXJrZWQobm9kZS0+bmV3X3RyeF9pZCwgbXRyKSkgewotCi0JCS8q
IE9rLCB3ZSBjYW4gcmVtb3ZlICovCi0JfSBlbHNlIHsKLQkJcmV0dXJuKERCX1NVQ0NFU1MpOwot
CX0KKwlidHJfY3VyID0gYnRyX3BjdXJfZ2V0X2J0cl9jdXIoJm5vZGUtPnBjdXIpOwogCiAJaWYg
KG1vZGUgPT0gQlRSX01PRElGWV9MRUFGKSB7Ci0JCXN1Y2Nlc3MgPSBidHJfY3VyX29wdGltaXN0
aWNfZGVsZXRlKGJ0cl9jdXIsIG10cik7Ci0KLQkJaWYgKHN1Y2Nlc3MpIHsKLQkJCWVyciA9IERC
X1NVQ0NFU1M7Ci0JCX0gZWxzZSB7Ci0JCQllcnIgPSBEQl9GQUlMOwotCQl9CisJCWVyciA9IGJ0
cl9jdXJfb3B0aW1pc3RpY19kZWxldGUoYnRyX2N1ciwgbXRyKQorCQkJPyBEQl9TVUNDRVNTCisJ
CQk6IERCX0ZBSUw7CiAJfSBlbHNlIHsKIAkJdXRfYWQobW9kZSA9PSBCVFJfTU9ESUZZX1RSRUUp
OwogCgo=

--===============1677077073==
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.1-innodb/
# testament_sha1: 7bfddce40f31a704e156908943da79334918bf11
# timestamp: 2011-02-02 14:12:57 +0200
# base_revision_id: marko.makela@stripped\
#   bqpq712rw169zkb3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVI3cywAAwbflFAwe3f///83
HiC/7//+BAAIAGAGjc32gOvQ3vOaFCmmjtnhkgQJ6mp5GmJPAUPSmg3qjRoaAA9Q0AGpR6h6h6nq
b1R6mg0aGgAAAAAAABojIFTbRTeqaNA9QNAAAyAAAABKampppqaRkmyaepoAjNNIwIxMTI09NNJ6
TTQ4yZNDEYmjAIwEwgDATTRpkaAYSREyAmEZCZJmpmptUzVPGiJ5QNDJ6j1MNqhgWAwoEJQIiAIU
Af1PoZTR2NYR3Jef07+Voy26TnQc9kmoPGsQFgtwHWWkKLdKtGEwygho0iaNTAxqB12ajFKCL1rz
sGsMOl34I4od96dx3NsmcAkgSZjJ+g080Z0WPfWqo4IOQiO1MUWJylSUlBQOKAJMSEWn9/A167Rp
t8WeLblwu6PmqhLAxnG9Q4xN3zK4uL8DcFwOJxNn0k7EF5ecCAdz13PjSYmk5yvO/46de4P3PRE+
umADoadg0gv89uIk2rbzXar9LohoUp6vZ8FoxXseeBrUKou/CBR7riF8hy6EOhxF+qF1C8RUJfBZ
CpO+qQHPPwLpV5cuVUqBhkl3CX3Hl6+Zu3GWFRAC21z3sKDa/dnBEG0tYS5CigHSP5k6Jiag3+M/
fFgZOWPXWLmK2LCmM2477fGxaUoWJ6+Zx8rsULKNEEFaQVvHXntvCuRdCwPxTnS6rnLRf2FstFLP
OHhFzYRKhhRL48TcbfUBVNgpTZcELNIhoUKCQwFRupWPEnIB6wKOsYopiKWTIpO1mb+oircqO8Yq
7kqJohTO85BO1iCARb+NQSegK/C8H1zBQRwgHi7wZm8Cq9ZsXzHXbi40CvC0jGdhICuk2rA3ixFq
VIcQI6GHaTnQ6enZQQUGhFgklbWpwwWkgywDQgYng1FrivIEwMirKUao1VzVhF+oasqdRpHwYsaO
UciNIuxwqksbQw3kRZGI3iVGq6yTUIolJ8P2T3nKsCYpqq4YLVDYZjihrpe+1FpKOWQV7snoWQp8
BajFoNRtIMBqeFjWxMSRk9TW404CpAshtKKgThELRGCoTCxKW5snbFJgPORzjM3UBWNJzADejTER
BCkQMg6UHFO01+5DzUjaBKIgpYyyGlhNU4POM2Sq4ISF+wyXc7eTQb7KTt0vWMeUMuKCR1tW0mtO
1D74VvYUJ/mCMWnCxUGOkcwpiHDy8v16JyQpSjMb5VFDWU110ImV1vftjIPFjx7xdCoSr/h5+R7T
5YiV286Oe06s5IoEurgWaebETCief2a7aU3YAWF36sJPYm+Ng5QksOxwv65wfMpPWbRRnheLAbBN
TSNDDpPwcOvsf0fMb3iBowBzQWu8bE+OqAchRNoGws6Gr5C0F57SXp7XnF2EtNuYljnVOg7mYZni
cWql0eDUGC3+Etew9c4lYTBvmRRZXq1P2C1OCr9MiMBPJVhsrponp3+w9XgP0UD87ut+twTqQB2e
BGMFyLjv2D+JqFXMHopUrUkGsIDhhyKnRqAtdn0x5tv2pkIrsptyVfZQe4SZp/YaLBgmCjPDNvZL
jE9GvQ3HK04DUHCUEGZcjtxpqDEXq22D73OJ1gRIiiq+07StYAfseBzMmOjt03QNA5sMhhy4yLwG
OoX8Xs3nndiB0IowQMcNQObnv6vuxbY6GnyLyS6wNhYwSX2l/TMjkm1dXLQ2MVkII+giVTFILd+4
FMzVaCe6shZJWZ8AqQ7ob/DiXWqxJgbxIZgU8tfY+RqotatiqYlL3iU9EfifBMPv1qkrI4nkA26h
8As4XhVUr1GYqteUrbViTJBUyeuQyB+SdFCi19xnpw6JNZQbnB7kpsEq4Lu5cmEonMOBsCkZhGv0
jcRLtGtPNku6cjbr+glgipsV5Om26YBWliwLLdGj09biAS2BA5x9UmprewV5lobGqBY0KHUw7+BX
NqhkVsPgKnY7FWQCEWcaSQVa3KM7kW6M9oGdsIm8ysgrgKS++mABqVCoaiyVh6wOjDXW2s2VlzM1
1onPinCEIuboQfseATlpCGTjHNsSlFblIcbi2rYNfGRBpzXQC8IRA5RYOkg1WhgaqVNuAZZlrEa4
5xpMVStxEMAMpxMFwMrIwdw4RPaA9+wBtM+PbDg3IqfiGLhS1bMwNgGsNWenYbdatiDNartiOMvg
B0AmhUplJiVpNQKJAMpJZ2XRQ2rcO28m3zT2H6fVY/Atf8XckU4UJBSN3MsA


--===============1677077073==--