From: marko.makela
Date: May 4 2010 1:14pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3442) Bug#53306
List-Archive: http://lists.mysql.com/commits/107320
X-Bug: 53306
Message-Id: <201005041314.o44D3agZ008661@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0037631047=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDQxMzA5MTctcW12emJq
M3BnaWwybnVhdAoKIDM0NDIgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBmc3BfaW5p
dF9maWxlX3BhZ2VfbG93KCk6IFplcm8gb3V0IHRoZSBwYWdlLiAoQnVnICM1MzMwNikKCiAgICBt
b2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9kaXNhYmxlZC5kZWYKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9mc3AvZnNwMGZzcC5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS91bml2LmkKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3QvZGlzYWJsZWQuZGVmJwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2Rpc2FibGVk
LmRlZgkyMDEwLTA0LTMwIDEwOjAyOjM2ICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3QvZGlzYWJsZWQuZGVmCTIwMTAtMDUtMDQgMTM6MTM6NTggKzAwMDAKQEAgLTksNCArOSwz
IEBACiAjICBEbyBub3QgdXNlIGFueSBUQUIgY2hhcmFjdGVycyBmb3Igd2hpdGVzcGFjZS4KICMK
ICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotaW5ub2RiIDogQnVnIzUzMzA2IDIwMTAtMDQtMzAgVmFz
aWxEaW1vdiB2YWxncmluZCB3YXJuaW5ncwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5u
b2Jhc2UvZnNwL2ZzcDBmc3AuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9mc3AvZnNwMGZzcC5j
CTIwMDctMDYtMjYgMTM6MDg6MTEgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9mc3AvZnNw
MGZzcC5jCTIwMTAtMDUtMDQgMTM6MTM6NTggKzAwMDAKQEAgLTgwMiwxMiArODAyLDcgQEAgZnNw
X2luaXRfZmlsZV9wYWdlX2xvdygKIAogCWJ1Zl9ibG9ja19hbGlnbihwYWdlKS0+Y2hlY2tfaW5k
ZXhfcGFnZV9hdF9mbHVzaCA9IEZBTFNFOwogCi0jaWZkZWYgVU5JVl9CQVNJQ19MT0dfREVCVUcK
LQltZW1zZXQocGFnZSwgMHhmZiwgVU5JVl9QQUdFX1NJWkUpOwotI2VuZGlmCi0JbWFjaF93cml0
ZV90b184KHBhZ2UgKyBVTklWX1BBR0VfU0laRSAtIEZJTF9QQUdFX0VORF9MU05fT0xEX0NIS1NV
TSwKLQkJCXV0X2R1bGludF96ZXJvKTsKLQltYWNoX3dyaXRlX3RvXzgocGFnZSArIEZJTF9QQUdF
X0xTTiwgdXRfZHVsaW50X3plcm8pOworCW1lbXNldChwYWdlLCAwLCBVTklWX1BBR0VfU0laRSk7
CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvdW5pdi5pJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdW5pdi5pCTIwMTAtMDQt
MjggMDY6MzM6MjUgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQky
MDEwLTA1LTA0IDEzOjEzOjU4ICswMDAwCkBAIC0xMjYsMTEgKzEyNiw2IEBAIGJ5IG9uZS4gKi8K
IAkJCS8qIHRoZSBhYm92ZSBvcHRpb24gcHJldmVudHMgZm9yY2luZyBvZiBsb2cgdG8gZGlzawog
CQkJYXQgYSBidWZmZXIgcGFnZSB3cml0ZTogaXQgc2hvdWxkIGJlIHRlc3RlZCB3aXRoIHRoaXMK
IAkJCW9wdGlvbiBvZmY7IGFsc28gc29tZSBpYnVmIHRlc3RzIGFyZSBzdXBwcmVzc2VkICovCi0v
KgotI2RlZmluZSBVTklWX0JBU0lDX0xPR19ERUJVRwotKi8KLQkJCS8qIHRoZSBhYm92ZSBvcHRp
b24gZW5hYmxlcyBiYXNpYyByZWNvdmVyeSBkZWJ1Z2dpbmc6Ci0JCQluZXcgYWxsb2NhdGVkIGZp
bGUgcGFnZXMgYXJlIHJlc2V0ICovCiAKICNpZiAoIWRlZmluZWQoVU5JVl9ERUJVRykgJiYgIWRl
ZmluZWQoSU5TSURFX0hBX0lOTk9CQVNFX0NDKSAmJiAhZGVmaW5lZChVTklWX01VU1RfTk9UX0lO
TElORSkpCiAvKiBEZWZpbml0aW9uIGZvciBpbmxpbmUgdmVyc2lvbiAqLwoK

--===============0037631047==
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: fecd65fe888e24af32f5183f73deca4ba1cc9040
# timestamp: 2010-05-04 16:14:06 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   qmvzbj3pgil2nuat
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ+hXD8AAuHfgEAwW2f//3Oj
SxC////wUAVYu3qACd10DLpc3hJIhNTxMhPTEZR6mANRMmEaaDQxBzCYBMAJhMJpgAAEyaaBhIpo
hKfoaaJPATSaaHqPUA0PUNqG1BoIqSbUZQ9R6ZR6mmjQaeo9QGgAA0GgSSBGSMAQFT9J6ptA0agz
QAjE02OLszzm0Nfd76eBxrrUwawPptn0ROgVMRqm9mOUpxs2/S/bizhlWRNjBvZyzI50rZheTLcU
ncUlNhnt68PFeHK8+zhqznVAu5gZWar756J30z528Hi764r3KzlfFfWJOszvSW82vWMZTnr5fuL4
Yqv6/HTJRWk47koyWwgLgwLCxZZtnDiuM9KlDl1r8tFjLZAXbZNDlFk3DSDt7LF2otw1iWVw5JOU
PqmkD3poCRHMotckoetLNCcECLkKJxpujTtGY4lckxMIzJ7jzVmpX13SCTTk+GO1LDc0Bhq3mLjb
0RNzpjvSpFZlVGHZutQttdBFxFLkbgtCZE0buzuMTNaJWxt3ndVk7deEiw8YjcVnDobzlEpekHDU
xqKj1j44JbC5PKEH73Kb1InAXPwYZvARqb0qyo7cT8COi2yZNsUytwjC8jgQgpDqS8g54jAzKukS
Jj0kRIJcywuS/CgWyaPBwFCkgeCGKDnMrEtCwilMxLkmkVyGL+oQGKEFkaf87Qsk143g9CwwHEDn
zxMEsjgDjUtEdo0jzmhYdcRxbA3k77DWXj2v7oXvkMPnjQwLB/ah6TFRxInfmkEBHiLhzjGB7uXG
GhXTU2oY2nAsiWzkytoIusflMvKmeQGzkR6jFZpeq4FZQYqCw7pOmovZXJMQNLCRSB1SoZGxLIvN
hDxVe7vuL2LZ6WkXBeiUgvFXKiTwRublxMjA8rMi4aAxw7B9bgm37kwlu4Bs9ETkVRKNmYT3tC/U
y5sY2/h8f5H5wCPx389937/o/2G959JkZjOmda4B9X0hLGDUPA2HIwLTed6SxHlqNxTarylV4iSj
J3K1+kArjVVTMJ7Ti8UNEBjvyZkmyGB2nga/K1J5cfU7Yy1e9Kplu/PYgYlOogWlYx1Ol5mZED9x
GKWprYcz2pVnsGNpy1Fxv1x5nPckmTs4BwtEUIyFjx9Q4jRWQokHyCPTElQmJlFaDrfFuHn5iJHr
fcvaEaAQcqUo+l8GojNRlNmdlvCY3GNpWlCBJqHm6XHCmclt5ULMAXTwLimSviy5MG8rgvKZVEb5
REaUFRoY1zmlKBcKRjQFZQHqtq3B86r3r4UqY2emGGGCRzdC/moz7YGvAbol66UMPivJa6hEJsCu
bWrUiEh0WLcKiSs9LoMUwkZ2wSnhgykW7M8AmcSfGTDGCnMfm8rUONXjE5OnJf6CRwpFWi8wVgyQ
Shv26dtcwZgDsr2iWbjvO4chlnU4fD+rMSRzPxPDnqVM8WLpZBjvDXblrQVOOqWkRIRLb57lDTaX
SpKOzExLtK41oCIRxejwSXEXMsHLJz6L9YhzP4tsZX33ozRhIHctP+otkkGqEV25eDOVl0AiZw9p
0I1UwiJsM6naiyqpJWKDTO8INtJFEpJyY3CuNGekgsDBUIcqkcUHka/OamBPVnlXoEO9X7RNvNch
YQHXQ0FU2XYOKxRC5KDhmRRw5ca14Z95jUlTZRdh0ftxqbspEc2lYm5VwpY6Wgc5wjwLMTbhGU0c
lyeHRFNZXuLuSKcKEhP0K4fg


--===============0037631047==--