From: marko.makela
Date: March 15 2011 1:29pm
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3346 to 3347)
List-Archive: http://lists.mysql.com/commits/133025
Message-Id: <201103151329.p2FDTJau013117@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1984319644=="

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

IDMzNDcgTWFya28gTcOka2Vsw6QJMjAxMS0wMy0xNQogICAgICBSZW1vdmUgdHJhaWxpbmcgd2hp
dGUgc3BhY2UuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBi
dWYuYwogMzM0NiBNYXJrbyBNw6RrZWzDpAkyMDExLTAzLTE1IFttZXJnZV0KICAgICAgTWVyZ2Ug
bXlzcWwtNS4xLWlubm9kYiB0byBteXNxbC01LjUtaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9w
YWdlL3BhZ2UwemlwLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1
ZjBidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMzE1MTAyNjUzLTdoNHM5aTE0aDhhZXc1NGEKKysrIGIv
c3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTEwMzE1MTMyNDUxLXBoZHI3cnRxNWdjZTQ5NDcKQEAgLTEyMzMsNyArMTIzMyw3IEBA
IGJ1Zl9wb29sX2luaXRfaW5zdGFuY2UoCiAKIAkJYnVmX3Bvb2wtPnBhZ2VfaGFzaCA9IGhhc2hf
Y3JlYXRlKDIgKiBidWZfcG9vbC0+Y3Vycl9zaXplKTsKIAkJYnVmX3Bvb2wtPnppcF9oYXNoID0g
aGFzaF9jcmVhdGUoMiAqIGJ1Zl9wb29sLT5jdXJyX3NpemUpOwotCQkKKwogCQlidWZfcG9vbC0+
bGFzdF9wcmludG91dF90aW1lID0gdXRfdGltZSgpOwogCX0KIAkvKiAyLiBJbml0aWFsaXplIGZs
dXNoaW5nIGZpZWxkcwpAQCAtMTM2NSwxMSArMTM2NSwxMSBAQCBidWZfcG9vbF9kcm9wX2hhc2hf
aW5kZXhfaW5zdGFuY2UoCiAJCQkvKiBibG9jay0+aXNfaGFzaGVkIGNhbm5vdCBiZSBtb2RpZmll
ZAogCQkJd2hlbiB3ZSBoYXZlIGFuIHgtbGF0Y2ggb24gYnRyX3NlYXJjaF9sYXRjaDsKIAkJCXNl
ZSB0aGUgY29tbWVudCBpbiBidWYwYnVmLmggKi8KLQkJCQorCiAJCQlpZiAoIWJsb2NrLT5pc19o
YXNoZWQpIHsKIAkJCQljb250aW51ZTsKIAkJCX0KLQkJCQorCiAJCQkvKiBUbyBmb2xsb3cgdGhl
IGxhdGNoaW5nIG9yZGVyLCB3ZQogCQkJaGF2ZSB0byByZWxlYXNlIGJ0cl9zZWFyY2hfbGF0Y2gK
IAkJCWJlZm9yZSBhY3F1aXJpbmcgYmxvY2stPmxhdGNoLiAqLwpAQCAtMTM3OCwxNCArMTM3OCwx
NCBAQCBidWZfcG9vbF9kcm9wX2hhc2hfaW5kZXhfaW5zdGFuY2UoCiAJCQl3ZSBtdXN0IHJlc2Nh
biBhbGwgYmxvY2tzLCBiZWNhdXNlCiAJCQlzb21lIG1heSBiZWNvbWUgaGFzaGVkIGFnYWluLiAq
LwogCQkJKnJlbGVhc2VkX3NlYXJjaF9sYXRjaCA9IFRSVUU7Ci0JCQkKKwogCQkJcndfbG9ja194
X2xvY2soJmJsb2NrLT5sb2NrKTsKLQkJCQorCiAJCQkvKiBUaGlzIHNob3VsZCBiZSBndWFyYW50
ZWVkIGJ5IHRoZQogCQkJY2FsbGVycywgd2hpY2ggd2lsbCBiZSBob2xkaW5nCiAJCQlidHJfc2Vh
cmNoX2VuYWJsZWRfbXV0ZXguICovCiAJCQl1dF9hZCghYnRyX3NlYXJjaF9lbmFibGVkKTsKLQkJ
CQorCiAJCQkvKiBCZWNhdXNlIHdlIGRpZCBub3QgYnVmZmVyLWZpeCB0aGUKIAkJCWJsb2NrIGJ5
IGNhbGxpbmcgYnVmX2Jsb2NrX2dldF9nZW4oKSwKIAkJCWl0IGlzIHBvc3NpYmxlIHRoYXQgdGhl
IGJsb2NrIGhhcyBiZWVuCkBAIC0xMzk1LDcgKzEzOTUsNyBAQCBidWZfcG9vbF9kcm9wX2hhc2hf
aW5kZXhfaW5zdGFuY2UoCiAJCQlibG9jayBpcyBtYXBwZWQgdG8uICBBbGwgd2Ugd2FudCB0byBk
bwogCQkJaXMgdG8gZHJvcCBhbnkgaGFzaCBlbnRyaWVzIHJlZmVycmluZwogCQkJdG8gdGhlIHBh
Z2UuICovCi0JCQkKKwogCQkJLyogSXQgaXMgcG9zc2libGUgdGhhdAogCQkJYmxvY2stPnBhZ2Uu
c3RhdGUgIT0gQlVGX0ZJTEVfUEFHRS4KIAkJCUV2ZW4gdGhhdCBkb2VzIG5vdCBtYXR0ZXIsIGJl
Y2F1c2UKQEAgLTE0MDMsMTggKzE0MDMsMTggQEAgYnVmX3Bvb2xfZHJvcF9oYXNoX2luZGV4X2lu
c3RhbmNlKAogCQkJY2hlY2sgYmxvY2stPmlzX2hhc2hlZCBiZWZvcmUgZG9pbmcKIAkJCWFueXRo
aW5nLiAgYmxvY2stPmlzX2hhc2hlZCBjYW4gb25seQogCQkJYmUgc2V0IG9uIHVuY29tcHJlc3Nl
ZCBmaWxlIHBhZ2VzLiAqLwotCQkJCisKIAkJCWJ0cl9zZWFyY2hfZHJvcF9wYWdlX2hhc2hfaW5k
ZXgoYmxvY2spOwotCQkJCisKIAkJCXJ3X2xvY2tfeF91bmxvY2soJmJsb2NrLT5sb2NrKTsKLQkJ
CQorCiAJCQlyd19sb2NrX3hfbG9jaygmYnRyX3NlYXJjaF9sYXRjaCk7Ci0JCQkKKwogCQkJdXRf
YWQoIWJ0cl9zZWFyY2hfZW5hYmxlZCk7CiAJCX0KIAl9CiB9Ci0gCisKIC8qKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8v
KioKIERyb3BzIHRoZSBhZGFwdGl2ZSBoYXNoIGluZGV4LiAgVG8gcHJldmVudCBhIGxpdmVsb2Nr
LCB0aGlzIGZ1bmN0aW9uCiBpcyBvbmx5IHRvIGJlIGNhbGxlZCB3aGlsZSBob2xkaW5nIGJ0cl9z
ZWFyY2hfbGF0Y2ggYW5kIHdoaWxlCkBAIC0xOTkwLDMwICsxOTkwLDMwIEBAIGJ1Zl9wb29sX3Jl
c2l6ZSh2b2lkKQogCXVsaW50CW1pbl9jaGFuZ2Vfc2l6ZSA9IDEwNDg1NzYgKiBzcnZfYnVmX3Bv
b2xfaW5zdGFuY2VzOwogCiAJYnVmX3Bvb2xfbXV0ZXhfZW50ZXJfYWxsKCk7Ci0gIAorCiAgIAlp
ZiAoc3J2X2J1Zl9wb29sX29sZF9zaXplID09IHNydl9idWZfcG9vbF9zaXplKSB7Ci0gIAorCiAJ
CWJ1Zl9wb29sX211dGV4X2V4aXRfYWxsKCk7CiAKICAgCQlyZXR1cm47CiAKICAgCX0gZWxzZSBp
ZiAoc3J2X2J1Zl9wb29sX2N1cnJfc2l6ZSArIG1pbl9jaGFuZ2Vfc2l6ZQogCQkgICA+IHNydl9i
dWZfcG9vbF9zaXplKSB7Ci0gIAorCiAJCWNoYW5nZV9zaXplID0gKHNydl9idWZfcG9vbF9jdXJy
X3NpemUgLSBzcnZfYnVmX3Bvb2xfc2l6ZSkKIAkJCSAgICAvIFVOSVZfUEFHRV9TSVpFOwogCiAJ
CWJ1Zl9wb29sX211dGV4X2V4aXRfYWxsKCk7Ci0gIAorCiAgIAkJLyogRGlzYWJsZSBhZGFwdGl2
ZSBoYXNoIGluZGV4ZXMgYW5kIGVtcHR5IHRoZSBpbmRleAogICAJCWluIG9yZGVyIHRvIGZyZWUg
dXAgbWVtb3J5IGluIHRoZSBidWZmZXIgcG9vbCBjaHVua3MuICovCiAJCWJ1Zl9wb29sX3Nocmlu
ayhjaGFuZ2Vfc2l6ZSk7CiAKIAl9IGVsc2UgaWYgKHNydl9idWZfcG9vbF9jdXJyX3NpemUgKyBt
aW5fY2hhbmdlX3NpemUKIAkJICAgPCBzcnZfYnVmX3Bvb2xfc2l6ZSkgewotIAorCiAgIAkJLyog
RW5sYXJnZSB0aGUgYnVmZmVyIHBvb2wgYnkgYXQgbGVhc3Qgb25lIG1lZ2FieXRlICovCi0gIAor
CiAJCWNoYW5nZV9zaXplID0gc3J2X2J1Zl9wb29sX3NpemUgLSBzcnZfYnVmX3Bvb2xfY3Vycl9z
aXplOwogCiAJCWJ1Zl9wb29sX211dGV4X2V4aXRfYWxsKCk7CkBAIC0yMDI2LDEwICsyMDI2LDEw
IEBAIGJ1Zl9wb29sX3Jlc2l6ZSh2b2lkKQogCiAJCXJldHVybjsKIAl9Ci0gIAorCiAgIAlidWZf
cG9vbF9wYWdlX2hhc2hfcmVidWlsZCgpOwogfQotIAorCiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJlbW92ZSB0
aGUgc2VudGluZWwgYmxvY2sgZm9yIHRoZSB3YXRjaCBiZWZvcmUgcmVwbGFjaW5nIGl0IHdpdGgg
YSByZWFsIGJsb2NrLgogYnVmX3BhZ2Vfd2F0Y2hfY2xlYXIoKSBvciBidWZfcGFnZV93YXRjaF9v
Y2N1cnJlZCgpIHdpbGwgbm90aWNlIHRoYXQKQEAgLTI4OTAsNyArMjg5MCw3IEBAIHdhaXRfdW50
aWxfdW5maXhlZDoKIAkJCVRyeSBhZ2FpbiBsYXRlci4gKi8KIAkJCWJ1Zl9wb29sX211dGV4X2V4
aXQoYnVmX3Bvb2wpOwogCQkJb3NfdGhyZWFkX3NsZWVwKFdBSVRfRk9SX1JFQUQpOwotICAKKwog
CQkJZ290byBsb29wOwogCQl9CiAKQEAgLTQ4MDYsNyArNDgwNiw3IEBAIGJ1Zl9nZXRfbW9kaWZp
ZWRfcmF0aW9fcGN0KHZvaWQpCiAJYnVmX2dldF90b3RhbF9saXN0X2xlbigmbHJ1X2xlbiwgJmZy
ZWVfbGVuLCAmZmx1c2hfbGlzdF9sZW4pOwogCiAJcmF0aW8gPSAoMTAwICogZmx1c2hfbGlzdF9s
ZW4pIC8gKDEgKyBscnVfbGVuICsgZnJlZV9sZW4pOwotICAKKwogCS8qIDEgKyBpcyB0aGVyZSB0
byBhdm9pZCBkaXZpc2lvbiBieSB6ZXJvICovCiAKIAlyZXR1cm4ocmF0aW8pOwpAQCAtNTE4OSw3
ICs1MTg5LDcgQEAgYnVmX2FsbF9mcmVlZCh2b2lkKQogCiAJcmV0dXJuKFRSVUUpOwogfQotICAK
KwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKi8vKioKIENoZWNrcyB0aGF0IHRoZXJlIGN1cnJlbnRseSBhcmUgbm8g
cGVuZGluZyBpL28tb3BlcmF0aW9ucyBmb3IgdGhlIGJ1ZmZlcgogcG9vbC4KCg==

--===============1984319644==
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.5-innodb/
# testament_sha1: a5200559782a9a691a01b45cf12170333ffbc39c
# timestamp: 2011-03-15 15:29:13 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   7h4s9i14h8aew54a
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfVnPTEAAmBflAAQUmP/91MC
EAC/7//wBAAIAFAD2JNXtqXDpHA2pKn5T1TYTaCngVPCnmqYh6m1AbUwkkU8m0hop+lT9SeSMj1B
6jJo0NADEjQmmiM0SnlM1D1DQNABoGAAGgADJoAAA0AkkTUn6J6nqjwo2iekZNNqHqABppUkjHlA
khePa4EhraEwSdIu2zX3nAwk28E2Q3dhV6s0uOVEkAD4/AgF5Zywt94SkwQUlaLCaik7MgHWbhhn
wZ09WonQeM4UeDhohp0UsKSkY/2z0+/v9bv0xBk3Wq9dd1fXVJzJUkFvrcdkKJgYEDTPd7Zo3Xyg
+ktSMAUZT7YaPXiwJmAZqswPIe5DKQQUAIBEBDu0KEpDWBiGDSRRuOJpOPrNiAbImqS1BxxHTwwc
ogc/sOvpzBDQY41FGMOOm1pTFpAFgMHkmF4Gv3z0V9kFipv9Fdd/vt1GEAYb7eYXR4ZtPbPrGsmb
SKjMCHQEMAHXFpgMJzBiqTMojrRw38G70PqYBjnk2ejJrrIsggxAXNtck4ixJMVMGeVzzQtkTmVB
SPcGDWsLBipMOrNIGpEU+A3GiBcIZQOnI3kblpYRqee2oMT50Kx3K9P2u0PRO3Uro2MTgPqqfkTm
cq0uQg9CO64PzOlBxoXK1EYWybFJwk46o5joIzPLapStYyFuK5Ce1Ns4xhHXJUVTQ2ZdeO1iHA4S
WldeSoZ6wK0IkVXJOvTq7NRSFEnNutyBEMhh2qN5qtaLFB8bxT3IrATYqacUAnRWPyHD3XuMW8Ie
rt78j2JEZ2GXZzxc6WpfQyV+b0yVykZArO/muILGqhxgW7tgrgXOut+ycX7igfx4cShO0w6SaDiC
f83Lh/m2w/hoMp/pyQhlsJ6NTI6KSkJjvUV4dkW56PZgUgXlTZ8rdlctrExLxHPPaPqNIoW9aojH
py7uBSabffmQFlDeYXd++ydA7RIK40knGOHRNtUr8ps3h9uPcFx8lkMa44c+HDRRStLIj9SYZEq/
BW8s1eXZQVFNS9+nXNl5p1KIiu4TVnqeGKWKJu1IkZWDW0Kr07jQxV5Y8u7Qlwj/X1wtDaHDa+nT
Ym50jjaFwLpCIRcktkUhlHRuzZskjFIrD6PYZ101nfIspqhAhQF9DwexpmnXRQ5ky16gVErQUAxe
fiRgGNK3PU7DlfZmUThcWF5UF4+O+65iqkp9MZoftsYP3TBRTxtLoKUky6KF5Y5MPxBprTPAmjPs
ZvIxrB6HPC3ZUcKqIsIcFGCrhlsg4zT1orJYsEk9SP+M/P/i7kinChIerOemIA==


--===============1984319644==--