From: marko.makela
Date: March 15 2011 1:29pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3538 to 3539)
List-Archive: http://lists.mysql.com/commits/133026
Message-Id: <201103151329.p2FDTcTd028025@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1091561384=="

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

IDM1MzkgTWFya28gTcOka2Vsw6QJMjAxMS0wMy0xNSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVmLmMKIDM1MzggTWFya28gTcOka2Vsw6QJMjAxMS0w
My0xNSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLTUuNS1pbm5vZGIgdG8gbXlzcWwtdHJ1bmst
aW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3Vy
LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9wYWdlL3BhZ2UwemlwLmMKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFz
ZS9idWYvYnVmMGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMzE1MTA1
NzQ3LXJheXhubW15NThkN2Q3anEKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5j
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMzE1MTMyNjM0LXZleXc4aGZ2YXZw
d2d3b2UKQEAgLTEzODUsMTEgKzEzODUsMTEgQEAgYnVmX3Bvb2xfZHJvcF9oYXNoX2luZGV4X2lu
c3RhbmNlKAogCQkJLyogYmxvY2stPmlzX2hhc2hlZCBjYW5ub3QgYmUgbW9kaWZpZWQKIAkJCXdo
ZW4gd2UgaGF2ZSBhbiB4LWxhdGNoIG9uIGJ0cl9zZWFyY2hfbGF0Y2g7CiAJCQlzZWUgdGhlIGNv
bW1lbnQgaW4gYnVmMGJ1Zi5oICovCi0JCQkKKwogCQkJaWYgKCFibG9jay0+aXNfaGFzaGVkKSB7
CiAJCQkJY29udGludWU7CiAJCQl9Ci0JCQkKKwogCQkJLyogVG8gZm9sbG93IHRoZSBsYXRjaGlu
ZyBvcmRlciwgd2UKIAkJCWhhdmUgdG8gcmVsZWFzZSBidHJfc2VhcmNoX2xhdGNoCiAJCQliZWZv
cmUgYWNxdWlyaW5nIGJsb2NrLT5sYXRjaC4gKi8KQEAgLTEzOTgsMTQgKzEzOTgsMTQgQEAgYnVm
X3Bvb2xfZHJvcF9oYXNoX2luZGV4X2luc3RhbmNlKAogCQkJd2UgbXVzdCByZXNjYW4gYWxsIGJs
b2NrcywgYmVjYXVzZQogCQkJc29tZSBtYXkgYmVjb21lIGhhc2hlZCBhZ2Fpbi4gKi8KIAkJCSpy
ZWxlYXNlZF9zZWFyY2hfbGF0Y2ggPSBUUlVFOwotCQkJCisKIAkJCXJ3X2xvY2tfeF9sb2NrKCZi
bG9jay0+bG9jayk7Ci0JCQkKKwogCQkJLyogVGhpcyBzaG91bGQgYmUgZ3VhcmFudGVlZCBieSB0
aGUKIAkJCWNhbGxlcnMsIHdoaWNoIHdpbGwgYmUgaG9sZGluZwogCQkJYnRyX3NlYXJjaF9lbmFi
bGVkX211dGV4LiAqLwogCQkJdXRfYWQoIWJ0cl9zZWFyY2hfZW5hYmxlZCk7Ci0JCQkKKwogCQkJ
LyogQmVjYXVzZSB3ZSBkaWQgbm90IGJ1ZmZlci1maXggdGhlCiAJCQlibG9jayBieSBjYWxsaW5n
IGJ1Zl9ibG9ja19nZXRfZ2VuKCksCiAJCQlpdCBpcyBwb3NzaWJsZSB0aGF0IHRoZSBibG9jayBo
YXMgYmVlbgpAQCAtMTQxNSw3ICsxNDE1LDcgQEAgYnVmX3Bvb2xfZHJvcF9oYXNoX2luZGV4X2lu
c3RhbmNlKAogCQkJYmxvY2sgaXMgbWFwcGVkIHRvLiAgQWxsIHdlIHdhbnQgdG8gZG8KIAkJCWlz
IHRvIGRyb3AgYW55IGhhc2ggZW50cmllcyByZWZlcnJpbmcKIAkJCXRvIHRoZSBwYWdlLiAqLwot
CQkJCisKIAkJCS8qIEl0IGlzIHBvc3NpYmxlIHRoYXQKIAkJCWJsb2NrLT5wYWdlLnN0YXRlICE9
IEJVRl9GSUxFX1BBR0UuCiAJCQlFdmVuIHRoYXQgZG9lcyBub3QgbWF0dGVyLCBiZWNhdXNlCkBA
IC0xNDIzLDE4ICsxNDIzLDE4IEBAIGJ1Zl9wb29sX2Ryb3BfaGFzaF9pbmRleF9pbnN0YW5jZSgK
IAkJCWNoZWNrIGJsb2NrLT5pc19oYXNoZWQgYmVmb3JlIGRvaW5nCiAJCQlhbnl0aGluZy4gIGJs
b2NrLT5pc19oYXNoZWQgY2FuIG9ubHkKIAkJCWJlIHNldCBvbiB1bmNvbXByZXNzZWQgZmlsZSBw
YWdlcy4gKi8KLQkJCQorCiAJCQlidHJfc2VhcmNoX2Ryb3BfcGFnZV9oYXNoX2luZGV4KGJsb2Nr
KTsKLQkJCQorCiAJCQlyd19sb2NrX3hfdW5sb2NrKCZibG9jay0+bG9jayk7Ci0JCQkKKwogCQkJ
cndfbG9ja194X2xvY2soJmJ0cl9zZWFyY2hfbGF0Y2gpOwotCQkJCisKIAkJCXV0X2FkKCFidHJf
c2VhcmNoX2VuYWJsZWQpOwogCQl9CiAJfQogfQotIAorCiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBEcm9w
cyB0aGUgYWRhcHRpdmUgaGFzaCBpbmRleC4gIFRvIHByZXZlbnQgYSBsaXZlbG9jaywgdGhpcyBm
dW5jdGlvbgogaXMgb25seSB0byBiZSBjYWxsZWQgd2hpbGUgaG9sZGluZyBidHJfc2VhcmNoX2xh
dGNoIGFuZCB3aGlsZQpAQCAtMjA4MSwzMCArMjA4MSwzMCBAQCBidWZfcG9vbF9yZXNpemUodm9p
ZCkKIAl1bGludAltaW5fY2hhbmdlX3NpemUgPSAxMDQ4NTc2ICogc3J2X2J1Zl9wb29sX2luc3Rh
bmNlczsKIAogCWJ1Zl9wb29sX211dGV4X2VudGVyX2FsbCgpOwotICAKKwogICAJaWYgKHNydl9i
dWZfcG9vbF9vbGRfc2l6ZSA9PSBzcnZfYnVmX3Bvb2xfc2l6ZSkgewotICAKKwogCQlidWZfcG9v
bF9tdXRleF9leGl0X2FsbCgpOwogCiAgIAkJcmV0dXJuOwogCiAgIAl9IGVsc2UgaWYgKHNydl9i
dWZfcG9vbF9jdXJyX3NpemUgKyBtaW5fY2hhbmdlX3NpemUKIAkJICAgPiBzcnZfYnVmX3Bvb2xf
c2l6ZSkgewotICAKKwogCQljaGFuZ2Vfc2l6ZSA9IChzcnZfYnVmX3Bvb2xfY3Vycl9zaXplIC0g
c3J2X2J1Zl9wb29sX3NpemUpCiAJCQkgICAgLyBVTklWX1BBR0VfU0laRTsKIAogCQlidWZfcG9v
bF9tdXRleF9leGl0X2FsbCgpOwotICAKKwogICAJCS8qIERpc2FibGUgYWRhcHRpdmUgaGFzaCBp
bmRleGVzIGFuZCBlbXB0eSB0aGUgaW5kZXgKICAgCQlpbiBvcmRlciB0byBmcmVlIHVwIG1lbW9y
eSBpbiB0aGUgYnVmZmVyIHBvb2wgY2h1bmtzLiAqLwogCQlidWZfcG9vbF9zaHJpbmsoY2hhbmdl
X3NpemUpOwogCiAJfSBlbHNlIGlmIChzcnZfYnVmX3Bvb2xfY3Vycl9zaXplICsgbWluX2NoYW5n
ZV9zaXplCiAJCSAgIDwgc3J2X2J1Zl9wb29sX3NpemUpIHsKLSAKKwogICAJCS8qIEVubGFyZ2Ug
dGhlIGJ1ZmZlciBwb29sIGJ5IGF0IGxlYXN0IG9uZSBtZWdhYnl0ZSAqLwotICAKKwogCQljaGFu
Z2Vfc2l6ZSA9IHNydl9idWZfcG9vbF9zaXplIC0gc3J2X2J1Zl9wb29sX2N1cnJfc2l6ZTsKIAog
CQlidWZfcG9vbF9tdXRleF9leGl0X2FsbCgpOwpAQCAtMjExNywxMCArMjExNywxMCBAQCBidWZf
cG9vbF9yZXNpemUodm9pZCkKIAogCQlyZXR1cm47CiAJfQotICAKKwogICAJYnVmX3Bvb2xfcGFn
ZV9oYXNoX3JlYnVpbGQoKTsKIH0KLSAKKwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBSZW1vdmUgdGhlIHNlbnRp
bmVsIGJsb2NrIGZvciB0aGUgd2F0Y2ggYmVmb3JlIHJlcGxhY2luZyBpdCB3aXRoIGEgcmVhbCBi
bG9jay4KIGJ1Zl9wYWdlX3dhdGNoX2NsZWFyKCkgb3IgYnVmX3BhZ2Vfd2F0Y2hfb2NjdXJyZWQo
KSB3aWxsIG5vdGljZSB0aGF0CkBAIC01MTY3LDcgKzUxNjcsNyBAQCBidWZfZ2V0X21vZGlmaWVk
X3JhdGlvX3BjdCh2b2lkKQogCWJ1Zl9nZXRfdG90YWxfbGlzdF9sZW4oJmxydV9sZW4sICZmcmVl
X2xlbiwgJmZsdXNoX2xpc3RfbGVuKTsKIAogCXJhdGlvID0gKDEwMCAqIGZsdXNoX2xpc3RfbGVu
KSAvICgxICsgbHJ1X2xlbiArIGZyZWVfbGVuKTsKLSAgCisKIAkvKiAxICsgaXMgdGhlcmUgdG8g
YXZvaWQgZGl2aXNpb24gYnkgemVybyAqLwogCiAJcmV0dXJuKHJhdGlvKTsKCg==

--===============1091561384==
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:29:32 +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==


--===============1091561384==--