From: marko.makela
Date: March 15 2011 1:27pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3539)
List-Archive: http://lists.mysql.com/commits/133024
Message-Id: <201103151328.p2FDS5Fq011856@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2138776255=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDMxNTEwNTc0Ny1yYXl4
bm1teTU4ZDdkN2pxCgogMzUzOSBNYXJrbyBNw6RrZWzDpAkyMDExLTAzLTE1IFttZXJnZV0KICAg
ICAgTWVyZ2UgbXlzcWwtNS41LWlubm9kYiB0byBteXNxbC10cnVuay1pbm5vZGIuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL2J1Zi9idWYwYnVmLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAzMTUx
MDU3NDctcmF5eG5tbXk1OGQ3ZDdqcQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVm
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAzMTUxMzI2MzQtdmV5dzhoZnZh
dnB3Z3dvZQpAQCAtMTM4NSwxMSArMTM4NSwxMSBAQCBidWZfcG9vbF9kcm9wX2hhc2hfaW5kZXhf
aW5zdGFuY2UoCiAJCQkvKiBibG9jay0+aXNfaGFzaGVkIGNhbm5vdCBiZSBtb2RpZmllZAogCQkJ
d2hlbiB3ZSBoYXZlIGFuIHgtbGF0Y2ggb24gYnRyX3NlYXJjaF9sYXRjaDsKIAkJCXNlZSB0aGUg
Y29tbWVudCBpbiBidWYwYnVmLmggKi8KLQkJCQorCiAJCQlpZiAoIWJsb2NrLT5pc19oYXNoZWQp
IHsKIAkJCQljb250aW51ZTsKIAkJCX0KLQkJCQorCiAJCQkvKiBUbyBmb2xsb3cgdGhlIGxhdGNo
aW5nIG9yZGVyLCB3ZQogCQkJaGF2ZSB0byByZWxlYXNlIGJ0cl9zZWFyY2hfbGF0Y2gKIAkJCWJl
Zm9yZSBhY3F1aXJpbmcgYmxvY2stPmxhdGNoLiAqLwpAQCAtMTM5OCwxNCArMTM5OCwxNCBAQCBi
dWZfcG9vbF9kcm9wX2hhc2hfaW5kZXhfaW5zdGFuY2UoCiAJCQl3ZSBtdXN0IHJlc2NhbiBhbGwg
YmxvY2tzLCBiZWNhdXNlCiAJCQlzb21lIG1heSBiZWNvbWUgaGFzaGVkIGFnYWluLiAqLwogCQkJ
KnJlbGVhc2VkX3NlYXJjaF9sYXRjaCA9IFRSVUU7Ci0JCQkKKwogCQkJcndfbG9ja194X2xvY2so
JmJsb2NrLT5sb2NrKTsKLQkJCQorCiAJCQkvKiBUaGlzIHNob3VsZCBiZSBndWFyYW50ZWVkIGJ5
IHRoZQogCQkJY2FsbGVycywgd2hpY2ggd2lsbCBiZSBob2xkaW5nCiAJCQlidHJfc2VhcmNoX2Vu
YWJsZWRfbXV0ZXguICovCiAJCQl1dF9hZCghYnRyX3NlYXJjaF9lbmFibGVkKTsKLQkJCQorCiAJ
CQkvKiBCZWNhdXNlIHdlIGRpZCBub3QgYnVmZmVyLWZpeCB0aGUKIAkJCWJsb2NrIGJ5IGNhbGxp
bmcgYnVmX2Jsb2NrX2dldF9nZW4oKSwKIAkJCWl0IGlzIHBvc3NpYmxlIHRoYXQgdGhlIGJsb2Nr
IGhhcyBiZWVuCkBAIC0xNDE1LDcgKzE0MTUsNyBAQCBidWZfcG9vbF9kcm9wX2hhc2hfaW5kZXhf
aW5zdGFuY2UoCiAJCQlibG9jayBpcyBtYXBwZWQgdG8uICBBbGwgd2Ugd2FudCB0byBkbwogCQkJ
aXMgdG8gZHJvcCBhbnkgaGFzaCBlbnRyaWVzIHJlZmVycmluZwogCQkJdG8gdGhlIHBhZ2UuICov
Ci0JCQkKKwogCQkJLyogSXQgaXMgcG9zc2libGUgdGhhdAogCQkJYmxvY2stPnBhZ2Uuc3RhdGUg
IT0gQlVGX0ZJTEVfUEFHRS4KIAkJCUV2ZW4gdGhhdCBkb2VzIG5vdCBtYXR0ZXIsIGJlY2F1c2UK
QEAgLTE0MjMsMTggKzE0MjMsMTggQEAgYnVmX3Bvb2xfZHJvcF9oYXNoX2luZGV4X2luc3RhbmNl
KAogCQkJY2hlY2sgYmxvY2stPmlzX2hhc2hlZCBiZWZvcmUgZG9pbmcKIAkJCWFueXRoaW5nLiAg
YmxvY2stPmlzX2hhc2hlZCBjYW4gb25seQogCQkJYmUgc2V0IG9uIHVuY29tcHJlc3NlZCBmaWxl
IHBhZ2VzLiAqLwotCQkJCisKIAkJCWJ0cl9zZWFyY2hfZHJvcF9wYWdlX2hhc2hfaW5kZXgoYmxv
Y2spOwotCQkJCisKIAkJCXJ3X2xvY2tfeF91bmxvY2soJmJsb2NrLT5sb2NrKTsKLQkJCQorCiAJ
CQlyd19sb2NrX3hfbG9jaygmYnRyX3NlYXJjaF9sYXRjaCk7Ci0JCQkKKwogCQkJdXRfYWQoIWJ0
cl9zZWFyY2hfZW5hYmxlZCk7CiAJCX0KIAl9CiB9Ci0gCisKIC8qKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIERy
b3BzIHRoZSBhZGFwdGl2ZSBoYXNoIGluZGV4LiAgVG8gcHJldmVudCBhIGxpdmVsb2NrLCB0aGlz
IGZ1bmN0aW9uCiBpcyBvbmx5IHRvIGJlIGNhbGxlZCB3aGlsZSBob2xkaW5nIGJ0cl9zZWFyY2hf
bGF0Y2ggYW5kIHdoaWxlCkBAIC0yMDgxLDMwICsyMDgxLDMwIEBAIGJ1Zl9wb29sX3Jlc2l6ZSh2
b2lkKQogCXVsaW50CW1pbl9jaGFuZ2Vfc2l6ZSA9IDEwNDg1NzYgKiBzcnZfYnVmX3Bvb2xfaW5z
dGFuY2VzOwogCiAJYnVmX3Bvb2xfbXV0ZXhfZW50ZXJfYWxsKCk7Ci0gIAorCiAgIAlpZiAoc3J2
X2J1Zl9wb29sX29sZF9zaXplID09IHNydl9idWZfcG9vbF9zaXplKSB7Ci0gIAorCiAJCWJ1Zl9w
b29sX211dGV4X2V4aXRfYWxsKCk7CiAKICAgCQlyZXR1cm47CiAKICAgCX0gZWxzZSBpZiAoc3J2
X2J1Zl9wb29sX2N1cnJfc2l6ZSArIG1pbl9jaGFuZ2Vfc2l6ZQogCQkgICA+IHNydl9idWZfcG9v
bF9zaXplKSB7Ci0gIAorCiAJCWNoYW5nZV9zaXplID0gKHNydl9idWZfcG9vbF9jdXJyX3NpemUg
LSBzcnZfYnVmX3Bvb2xfc2l6ZSkKIAkJCSAgICAvIFVOSVZfUEFHRV9TSVpFOwogCiAJCWJ1Zl9w
b29sX211dGV4X2V4aXRfYWxsKCk7Ci0gIAorCiAgIAkJLyogRGlzYWJsZSBhZGFwdGl2ZSBoYXNo
IGluZGV4ZXMgYW5kIGVtcHR5IHRoZSBpbmRleAogICAJCWluIG9yZGVyIHRvIGZyZWUgdXAgbWVt
b3J5IGluIHRoZSBidWZmZXIgcG9vbCBjaHVua3MuICovCiAJCWJ1Zl9wb29sX3NocmluayhjaGFu
Z2Vfc2l6ZSk7CiAKIAl9IGVsc2UgaWYgKHNydl9idWZfcG9vbF9jdXJyX3NpemUgKyBtaW5fY2hh
bmdlX3NpemUKIAkJICAgPCBzcnZfYnVmX3Bvb2xfc2l6ZSkgewotIAorCiAgIAkJLyogRW5sYXJn
ZSB0aGUgYnVmZmVyIHBvb2wgYnkgYXQgbGVhc3Qgb25lIG1lZ2FieXRlICovCi0gIAorCiAJCWNo
YW5nZV9zaXplID0gc3J2X2J1Zl9wb29sX3NpemUgLSBzcnZfYnVmX3Bvb2xfY3Vycl9zaXplOwog
CiAJCWJ1Zl9wb29sX211dGV4X2V4aXRfYWxsKCk7CkBAIC0yMTE3LDEwICsyMTE3LDEwIEBAIGJ1
Zl9wb29sX3Jlc2l6ZSh2b2lkKQogCiAJCXJldHVybjsKIAl9Ci0gIAorCiAgIAlidWZfcG9vbF9w
YWdlX2hhc2hfcmVidWlsZCgpOwogfQotIAorCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFJlbW92ZSB0aGUgc2Vu
dGluZWwgYmxvY2sgZm9yIHRoZSB3YXRjaCBiZWZvcmUgcmVwbGFjaW5nIGl0IHdpdGggYSByZWFs
IGJsb2NrLgogYnVmX3BhZ2Vfd2F0Y2hfY2xlYXIoKSBvciBidWZfcGFnZV93YXRjaF9vY2N1cnJl
ZCgpIHdpbGwgbm90aWNlIHRoYXQKQEAgLTUxNjcsNyArNTE2Nyw3IEBAIGJ1Zl9nZXRfbW9kaWZp
ZWRfcmF0aW9fcGN0KHZvaWQpCiAJYnVmX2dldF90b3RhbF9saXN0X2xlbigmbHJ1X2xlbiwgJmZy
ZWVfbGVuLCAmZmx1c2hfbGlzdF9sZW4pOwogCiAJcmF0aW8gPSAoMTAwICogZmx1c2hfbGlzdF9s
ZW4pIC8gKDEgKyBscnVfbGVuICsgZnJlZV9sZW4pOwotICAKKwogCS8qIDEgKyBpcyB0aGVyZSB0
byBhdm9pZCBkaXZpc2lvbiBieSB6ZXJvICovCiAKIAlyZXR1cm4ocmF0aW8pOwoK

--===============2138776255==
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: 64321937c1fa2f9fbc2f7f3b08990e332355e799
# timestamp: 2011-03-15 15:28:00 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   rayxnmmy58d7d7jq
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfzx70AABB9flEAQUmP/91MC
EAC////wBAAIAGAGX28YoaCBN22xU4YTCSVTwmp6m2iantU8mamoGmjygaGmQCSmQpsKjyNGgmJA
AaNAaaBhoaAAADQAAAAAlNTTRNUNqGnqeoDQANDQNA9QYaGgAAA0AAAAAJJBMgJtGoCaJ4ptKbU8
UPUPUBhgkhsN5FJDHx2KnmMpTDbthnheAYMBtZMxLVR0t06VfRqb6unm1Xg1SkmJVJ11OPF9hiUI
CTCTMxq0sw0VvpsW+HLNUvumIeVyzPIsqKEqSkgoppRROX7cqKmzKyhECiIrO0VJ1FZ6UURJULKK
2pV7O5GRgYGr9PF54GtDOg8pat2/APgzLNZ590D4OSzFIPKxwvkBTF88FxFYLmeBS9qfseAigcTD
mKyrpqVBVEKTU4oE6+pnjBznc8TKwMGQmZIGGaFRgqyQt4oWPCQ4YYcHBMzFJGWebYjSLriw5Oud
3LPBMuEMmKE4ihN5E7ixSFawoNcyZgqIvtPAh+LrEySGXA3h5dDABOHjhTuPab1DGjtNxkWSAJOW
owKQwfImFcUcfwZEc1rUSJzcbC4zwy+BaLm3tovO41mXjkMbt3AKjCkZECuLylWlflHOGNkndowj
HbgEhuICcWRBYQUhqWhF3wCjFWEdHuFFSkZPLRQ0uS3HuMewiNSQX4YNloybEbNYlkHMJESDlOAB
2Z9nQUfHELFeMGImJMJ2MuEDEX2v43c2tzbBUfcZERXygE2DaMXMHFjwsz0YyiWFMWo4RwyCaaBJ
yHzTyJna4Q8GB+JqUHqvIVZ1Zbk+WMMlUnqVERFkwBRG5aOenTzX9d0vI2w4m5Upm4tnVYTrk6Fw
NZUKk6CaNriOROxsbtroM1VpFr2JzqK8FtYfDkJ2MSOZRGjibkZE9pgTjjsgztjId3mQgGUjvHGF
mdxNo1Wi3QLivjSMdZEWZBUFqfkormIt2U19rvBnelxUFZYkt9U6rhnHTElItLUVIGFFiasjmrDm
N6XUjLmLtuZYExaUfJXhViTXhDrxsLtwETK0LnR5PJQOViNAqTeZNsG/tW4l4Es3FhkUIDWFiFcP
CQ4TEhohNKUxjIUPcNT8Gw3heOO90sTrNJeNjkgGuNpITCNcoGONrxXkzMJK2EYMKdh5qFs6UYIF
Y/O4yO0QtHdAfXGoJxTUtA5IF57jcQLMhH0SQLmyIuEy7bevYTtg/TomTMSBZzqiZhD0kONMryyN
FTLklmqfY1BkDjxNqQDBKLS4oKRWkE41EgDCzqFXPNvEa8zxgwwhZiFtMtPI1s0paMrkUjMWq6KJ
IUv1JHDF4/8xYuqKJ0DT0EXlq9Dd9+sCAhYOcYU2bS01JiIntLudTx+3K89DuP3mrhmdQzS224Gf
5PHWj3ldnMYE1MCSpMMRz8CIN6QuWQQEwr9dxn9+h0PEJgbVWYrxRO4sBMKOjhN11r2kV3v6uc4x
LxS7JQdu0WByNx6HWy8g2iipEX86BvcXgUPTlFiBiI06xTUpCxLEzygqMj8ExIYBRcLOIR09iXZ8
aB58jMkXA9YHd6xynJcc0oGtAvI2pbkhbfA7+AFwLjIAcqIUEVyPaTJnyEL5oFtS/B4kGRAYg28y
RYcuG4obU9pkw36l3E8AGJjpOQORkl4pwsFhDQFAXXocIIFENnQW8EpAe5BfQhTS9bkd3iz1DnXc
MMJ4QKiJVibhf6rhHlefPHgHcRigCXqZBYIwOpQLZt2sSE9Fr6ETzERikwvVO2ES/BmZWl3IBxIN
jDY/RaEwJ+Qwx0DAvcXFodyRj0Kh6J1SsKQh2kLKLiuUx3CDmTSr49lpCaorC1gbLiZMLQWPAXT1
TmoCxFSSOsRVXhCxRH8Fp8H+LuSKcKEh+ePegA==


--===============2138776255==--