From: marko.makela
Date: April 6 2011 7:38am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3566)
List-Archive: http://lists.mysql.com/commits/134777
Message-Id: <201104060738.p367ciNb006686@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1038326362=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNjA2MzUyNS11bWVv
OTJvdHRsMWJteXMxCgogMzU2NiBNYXJrbyBNw6RrZWzDpAkyMDExLTA0LTA2IFttZXJnZV0KICAg
ICAgTWVyZ2UgbXlzcWwtNS41LWlubm9kYiB0byBteXNxbC10cnVuay1pbm5vZGIuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbG9nL2xvZzBsb2cuYwogICAgICBzdG9yYWdl
L2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9sb2cvbG9nMGxvZy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2xvZy9sb2cwbG9nLmMJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MDYwNjM1MjUtdW1lbzkyb3R0bDFi
bXlzMQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2xvZy9sb2cwbG9nLmMJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMTA0MDYwNzM3MTAtdW80YzBiM2FvNmtmODNhaApAQCAtMzI5Nyw2
ICszMjk3LDE0IEBAIGxvb3A6CiAJbG9nX2FyY2hpdmVfYWxsKCk7CiAjZW5kaWYgLyogVU5JVl9M
T0dfQVJDSElWRSAqLwogCWlmIChzcnZfZmFzdF9zaHV0ZG93biA9PSAyKSB7CisJCXV0X3ByaW50
X3RpbWVzdGFtcChzdGRlcnIpOworCQlmcHJpbnRmKHN0ZGVyciwKKwkJCSIgIElubm9EQjogTXlT
UUwgaGFzIHJlcXVlc3RlZCBhIHZlcnkgZmFzdCBzaHV0ZG93biIKKwkJCSIgd2l0aG91dCBmbHVz
aGluZyAiCisJCQkidGhlIElubm9EQiBidWZmZXIgcG9vbCB0byBkYXRhIGZpbGVzLiIKKwkJCSIg
QXQgdGhlIG5leHQgbXlzcWxkIHN0YXJ0dXAgIgorCQkJIklubm9EQiB3aWxsIGRvIGEgY3Jhc2gg
cmVjb3ZlcnkhXG4iKTsKKwogCQkvKiBJbiB0aGlzIGZhc3Rlc3Qgc2h1dGRvd24gd2UgZG8gbm90
IGZsdXNoIHRoZSBidWZmZXIgcG9vbDoKIAkJaXQgaXMgZXNzZW50aWFsbHkgYSAnY3Jhc2gnIG9m
IHRoZSBJbm5vREIgc2VydmVyLiBNYWtlIHN1cmUKIAkJdGhhdCB0aGUgbG9nIGlzIGFsbCBmbHVz
aGVkIHRvIGRpc2ssIHNvIHRoYXQgd2UgY2FuIHJlY292ZXIKCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9z
cnYvc3J2MHN0YXJ0LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MDYwNjM1
MjUtdW1lbzkyb3R0bDFibXlzMQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3RhcnQu
YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNjA3MzcxMC11bzRjMGIzYW82
a2Y4M2FoCkBAIC0yMTQ0LDE3ICsyMTQ0LDYgQEAgaW5ub2Jhc2Vfc2h1dGRvd25fZm9yX215c3Fs
KHZvaWQpCiAJVGhlIHN0ZXAgMSBpcyB0aGUgcmVhbCBJbm5vREIgc2h1dGRvd24uIFRoZSByZW1h
aW5pbmcgc3RlcHMgMiAtIC4uLgogCWp1c3QgZnJlZSBkYXRhIHN0cnVjdHVyZXMgYWZ0ZXIgdGhl
IHNodXRkb3duLiAqLwogCi0KLQlpZiAoc3J2X2Zhc3Rfc2h1dGRvd24gPT0gMikgewotCQl1dF9w
cmludF90aW1lc3RhbXAoc3RkZXJyKTsKLQkJZnByaW50ZihzdGRlcnIsCi0JCQkiICBJbm5vREI6
IE15U1FMIGhhcyByZXF1ZXN0ZWQgYSB2ZXJ5IGZhc3Qgc2h1dGRvd24iCi0JCQkiIHdpdGhvdXQg
Zmx1c2hpbmcgIgotCQkJInRoZSBJbm5vREIgYnVmZmVyIHBvb2wgdG8gZGF0YSBmaWxlcy4iCi0J
CQkiIEF0IHRoZSBuZXh0IG15c3FsZCBzdGFydHVwICIKLQkJCSJJbm5vREIgd2lsbCBkbyBhIGNy
YXNoIHJlY292ZXJ5IVxuIik7Ci0JfQotCiAJbG9nc19lbXB0eV9hbmRfbWFya19maWxlc19hdF9z
aHV0ZG93bigpOwogCiAJaWYgKHNydl9jb25jX25fdGhyZWFkcyAhPSAwKSB7Cgo=

--===============1038326362==
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.6-innodb/
# testament_sha1: 1447003bfc35619669be86b894c733b92635d41f
# timestamp: 2011-04-06 10:38:40 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   umeo92ottl1bmys1
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW2sysMABL9flAAwcmf//3cn
KAS/7//wBAAIAGAHfz2YAAAMgAUVVFHw1TTCmyTQZHqaDajIAAD1AZADmAAmTAAmEwTCGAIwAcwA
EyYAEwmCYQwBGABIkRJj0pmoANGQ0A0GgaAADSiYmJpkaYjIGQGBME0yA00YSSBNAmAIAEp5BQ8n
pI9TRoabUMhkMMlOIbaNcY6cSlg+/8wke5qUbQFS3Hjx1faJoOuYHsgmUH7TqfVIopnGBuhKvD9f
0m8MA6Aw2222jz8RWzJ1mCjpUGFqqcpEEDlEpPSibKcn0PtuzQuFbm6tO78QAaLsYb0910JgJTVV
AK7QUAkEzyDhxD7oAnKZledUT0OtixnZjwSGjAEvoEviOUEypWpVT3QE5wekN4FWDCsCjbD15Y/Q
7b2gC8pJcwVPqgUwCtdj5XNtmdCmC4gRXlxXBaVDJhhjigDzd6IA5bmbeGF8xznD0iLJDCPk7SF2
Z1EB2BT9DSoyj5kklT4CoFYOSFSKlMhFJWYlJW8oB4wmSeBIsI4qyYxQUfUFdUai7i3BiLdUXM8U
EV9T0A9npJfI7HYOeJA0sSStJkiggC4qA7Ki/LqQNxIwW8D2WJUQ/I3EfCqlrMbEr+wK+9dsKM/y
rfmGQMCyxV53ejZiK9C4fouqSWRYcWiy8ULBr1GsbVcdTIwcQNKS/KFhvAK1gxruQdD3GBhj3BFh
jRN4eS4LwqJK8/CWoVODNiohsycVUjzBJR2JLW62xaTAtBMSnZYpFW0ELJzNQBiBM1GqNn7iW6wr
KN1ySVyWw0SGCpNCKpYiVoWLc7lEtL6tao3liSg8Jil8C0uOIL1AprLbi2GWJWhSMCSq1HUG9jIr
UCd6li/LI6iId2Zt5jjwIWDNZTWXAoEYkCBIgTzQDDzC+ZttUCtKZXDVb6HMawXG5IUS6UKyKqiY
0MUF5cUK6OeJXgCY1LLSNg7QpSkQ3UAqSgsKOAEjCLo2D4AalpAeCrPJQki8joU4uiTGHAsTenDG
GRgBWVQJDQOCFQQhgSEqiQLC2qGYGMBqa1ixQaENbSiMLhry2Jjea4j7yo/hcEK4nLAZqnDmc51y
FWCxoubDepURakFUchinbB5Eq5SiT2kzGgNmUji8peepwLdqMCtIotdgZjy8aRJAcR4qBwDFA0RT
QUTGLQWY7BYjiN4C+YAYznJMcG0ZQ3DTBY0AXvIuUG0xNjjRvqdwEV3n74lCfxl0PKdWrrlBjDhk
GfxhL6uRFkWMw4+HSIJx04gqjwZYv61ET17ju58EAR+cIFvb6aIA5z+WxBBMDygDh/Rg4qJ+/CgC
20Sp/2MgCaUuRfVukq9tXnze8E24mfM3gVnzOpvOR/I7R1VPtSJVFpQtELsePoHzSXRwGYLu1aDQ
3XZQGtLsyQLgU6gnnfOILMFOmzZW2H8X9zLSbhkAZoA1L4ycejbeTdvuOJluH6l9iWdYFg8oENSb
7tg5As6lF3I5AnryKcFgrCrx9Ngd9mPSyCEGer+tU9iPZ/EjJmZsRu5thR6h6ByKw0GHYBJB1xPJ
y1x1rxaJj4HDs3GZz6ka8DgMcJ/qPD4pAe14ugmA4JuHLlmbvhxieCo6GxYWMvZwjWwRA8OqBdFl
1Onqs/BQdzeB5JlHpE5gqKUnZCy/YPYJo6No5y+B94uPjLYQcPUk0EjvX6hSMjW2McAnTEF+q5XN
qiW6SVOh2G4vEMbGg1BsLYStei/kg3ej6gtX995mUGQiqfkRZ4Ih536ITFu9AH+T4gb0EEgKyM+f
4XMC9WiIj0CIdwtQAwibYncy/cXUTB+ZKq+b1DAAFhyIV8kdiANbcEaCxMgTITHczZGQUqBkjkVm
MlEV35q2Kn0/DUoGZQCkrkgiZORLIVIX4poyAUFAxMYGcgXMtrHxns4cgD7KsC0CpVh0YNr3gjB/
hID8XpH2M9St+EAWoIROBXe1Rm36a6zoWtNW4xgwIFUPrj1thQUdkL5BwN/E+xyfqMFyQiZi+yQk
xYfEcKBdgpAgpRphGJIkLE+qE8nCaFiC0UYjMHGT/unGR2Qoe9VQ8li3o5DNeF2Li0QwXRYGPTDM
I5yio11CvZyVgiyt24T95DEBWQEpA9ge6QiKExFRHQvKwPYnuespG1ZnuDnWpqxBWBEFrN4FZUn8
dvr16DilOkhOAtsiY1H6fkpgtxBhXu3iOZBe6kvFBQsULsnIVKRIAyE8Kl+JFUEiBamyCY/gMhIX
i7kinChINtZlYYA=


--===============1038326362==--