From: marko.makela
Date: August 18 2010 11:29am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3544 to 3545) Bug#55626
List-Archive: http://lists.mysql.com/commits/116086
X-Bug: 55626
Message-Id: <201008181130.o7I9Z2iT025901@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0438322991=="

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

IDM1NDUgTWFya28gTcOka2Vsw6QJMjAxMC0wOC0xOAogICAgICBCdWcjNTU2MjY6IE1JTiBhbmQg
TUFYIHJlYWRpbmcgYSBkZWxldGUtbWFya2VkIHJlY29yZCBmcm9tIHNlY29uZGFyeSBpbmRleAog
ICAgICAKICAgICAgUmVtb3ZlIGEgYm9ndXMgZGVidWcgYXNzZXJ0aW9uIHRoYXQgdHJpZ2dlcmVk
IHRoZSBidWcuCiAgICAgIEFkZCBhc3NlcnRpb25zIHByZWNpc2VseSB3aGVyZSByZWNvcmRzIG11
c3Qgbm90IGJlIGRlbGV0ZS1tYXJrZWQuCiAgICAgIEFuZCBhIGNvbW1lbnQgdG8gY2xhcmlmeSB3
aGVuIHRoZSByZWNvcmQgaXMgYWxsb3dlZCB0byBiZSBkZWxldGUtbWFya2VkLgoKICAgIG1vZGlm
aWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBzZWwuYwogMzU0NCBWYXNp
bCBEaW1vdgkyMDEwLTA4LTE3IFttZXJnZV0KICAgICAgTWVyZ2UgbXlzcWwtNS4xLWlubm9kYiBm
cm9tIGJrLWludGVybmFsIGludG8gbXkgbG9jYWwgdHJlZQoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBkaWN0LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9o
YW5kbGVyL2hhX2lubm9kYi5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZGIwZXJy
LmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwogICAgICBzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vYnRyL2J0cjBzZWEuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGEv
aGEwaGEuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYV9pbm5vZGIuY2MK
ICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvYnRyMHNlYS5oCiAgICAgIHN0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2hhMGhhLmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL2luY2x1ZGUvdXQwbWVtLmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3V0L3V0MG1l
bS5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBzZWwu
YycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2VsLmMJcmV2aWQ6dmFzaWwu
ZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDgxNzE5MzkzNC0xeWw3enoyb2Rpa3hhdWY4CisrKyBiL3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwODE4MTEwMTEwLXpmczBpMXZmcmNjZmI0eXcKQEAgLTI2OTAsNyArMjY5MCw2
IEBAIHJvd19zZWxfc3RvcmVfbXlzcWxfcmVjKAogCXV0X2FkKHByZWJ1aWx0LT5teXNxbF90ZW1w
bGF0ZSk7CiAJdXRfYWQocHJlYnVpbHQtPmRlZmF1bHRfcmVjKTsKIAl1dF9hZChyZWNfb2Zmc192
YWxpZGF0ZShyZWMsIE5VTEwsIG9mZnNldHMpKTsKLQl1dF9hZCghcmVjX2dldF9kZWxldGVkX2Zs
YWcocmVjLCByZWNfb2Zmc19jb21wKG9mZnNldHMpKSk7CiAKIAlpZiAoVU5JVl9MSUtFTFlfTlVM
TChwcmVidWlsdC0+YmxvYl9oZWFwKSkgewogCQltZW1faGVhcF9mcmVlKHByZWJ1aWx0LT5ibG9i
X2hlYXApOwpAQCAtMzYxMSw2ICszNjEwLDcgQEAgcm93X3NlYXJjaF9mb3JfbXlzcWwoCiAJCQkJ
cm93X3NlbF90cnlfc2VhcmNoX3Nob3J0Y3V0X2Zvcl9teXNxbCgpLgogCQkJCVRoZSBsYXRjaCB3
aWxsIG5vdCBiZSByZWxlYXNlZCB1bnRpbAogCQkJCW10cl9jb21taXQoJm10cikuICovCisJCQkJ
dXRfYWQoIXJlY19nZXRfZGVsZXRlZF9mbGFnKHJlYywgY29tcCkpOwogCiAJCQkJaWYgKCFyb3df
c2VsX3N0b3JlX215c3FsX3JlYyhidWYsIHByZWJ1aWx0LAogCQkJCQkJCSAgICAgcmVjLCBvZmZz
ZXRzKSkgewpAQCAtNDIzOCw3ICs0MjM4LDcgQEAgbm9fZ2FwX2xvY2s6CiAKIAkJCQlyZWMgPSBv
bGRfdmVyczsKIAkJCX0KLQkJfSBlbHNlIGlmICghbG9ja19zZWNfcmVjX2NvbnNfcmVhZF9zZWVz
KHJlYywgdHJ4LT5yZWFkX3ZpZXcpKSB7CisJCX0gZWxzZSB7CiAJCQkvKiBXZSBhcmUgbG9va2lu
ZyBpbnRvIGEgbm9uLWNsdXN0ZXJlZCBpbmRleCwKIAkJCWFuZCB0byBnZXQgdGhlIHJpZ2h0IHZl
cnNpb24gb2YgdGhlIHJlY29yZCB3ZQogCQkJaGF2ZSB0byBsb29rIGFsc28gaW50byB0aGUgY2x1
c3RlcmVkIGluZGV4OiB0aGlzCkBAIC00MjQ2LDggKzQyNDYsMTIgQEAgbm9fZ2FwX2xvY2s6CiAJ
CQlpbmZvcm1hdGlvbiB2aWEgdGhlIGNsdXN0ZXJlZCBpbmRleCByZWNvcmQuICovCiAKIAkJCXV0
X2FkKGluZGV4ICE9IGNsdXN0X2luZGV4KTsKKwkJCXV0X2FkKCFkaWN0X2luZGV4X2lzX2NsdXN0
KGluZGV4KSk7CiAKLQkJCWdvdG8gcmVxdWlyZXNfY2x1c3RfcmVjOworCQkJaWYgKCFsb2NrX3Nl
Y19yZWNfY29uc19yZWFkX3NlZXMoCisJCQkJICAgIHJlYywgdHJ4LT5yZWFkX3ZpZXcpKSB7CisJ
CQkJZ290byByZXF1aXJlc19jbHVzdF9yZWM7CisJCQl9CiAJCX0KIAl9CiAKQEAgLTQzNzAsOCAr
NDM3NCwxMyBAQCByZXF1aXJlc19jbHVzdF9yZWM6CiAJCQkJCQkgIFVMSU5UX1VOREVGSU5FRCwg
JmhlYXApOwogCQkJcmVzdWx0X3JlYyA9IHJlYzsKIAkJfQorCisJCS8qIHJlc3VsdF9yZWMgY2Fu
IGxlZ2l0aW1hdGVseSBiZSBkZWxldGUtbWFya2VkCisJCW5vdyB0aGF0IGl0IGhhcyBiZWVuIGVz
dGFibGlzaGVkIHRoYXQgaXQgcG9pbnRzIHRvIGEKKwkJY2x1c3RlcmVkIGluZGV4IHJlY29yZCB0
aGF0IGV4aXN0cyBpbiB0aGUgcmVhZCB2aWV3LiAqLwogCX0gZWxzZSB7CiAJCXJlc3VsdF9yZWMg
PSByZWM7CisJCXV0X2FkKCFyZWNfZ2V0X2RlbGV0ZWRfZmxhZyhyZWMsIGNvbXApKTsKIAl9CiAK
IAkvKiBXZSBmb3VuZCBhIHF1YWxpZnlpbmcgcmVjb3JkICdyZXN1bHRfcmVjJy4gQXQgdGhpcyBw
b2ludCwKCg==

--===============0438322991==
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.1-innodb/
# testament_sha1: 290ccb27bbfcdd8ffba9fc9f5e11a5c651d20713
# timestamp: 2010-08-18 14:29:55 +0300
# base_revision_id: vasil.dimov@stripped\
#   1yl7zz2odikxauf8
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYRmypYAAgTflEAwenf//3Mj
EEC/7//6BAAIAFAE5kdcB5nLdlt62PYJJCAmTTSbRpkNNJNiaCADIGgBkjQT0RoCJHiIB6gADIAA
DQE0qeanqNTQxDQ0BkAAAAAYqZJsVNPNJqDaEZNMh6mnqDRiAAyCSJTTU9MKZk01MRkNGRiA0ABo
Bh7CHgMzMzMBL+69DXx9PCBF6bMZZm/lroeX6PbjwpNphfjoT2SMcZoM+EsODPkuV/vko3VUszAe
fzFX+Ypdl5RcYOAjnsGBdEg4h3/drPkHgvj89yL+XRLgnqsvKHdTG/imvrZaxzVAok2RfpEWfnCa
Dr0THwYlxHQzFiWit2U5Ud4a7DJc273g5g16k8qp4sZnRmNUnpaz14SVLkqlaI/C7+ayUq7Nx1h+
b9YrNOnlA9FKkMosQMfdLbVRNhBVsKllmS0OpeI6RyCHiuTVwTOZBdbkGHtwAIwkna2s0azjBqNJ
AeFbneDAEIHRbmxCLLgOgT4PU9kumFmXP7Cp3evM5Uv6vJVpzC2Xlx4blZrJ2Ugzz6HzcDxNaNun
VXJEERooRAJHTYygJmjgNvGnxI7g/p5350usl6YCGD4nR4hiLhqUMXIDSKwEnsxbJBdoIcFwYF3B
wF04TCpEWFTsd4Atcw43UD+mS8T8kWlsTk8b7hqcIGojnpdYU3BOoyrPI4IMcS5TtQYYQ1SJUDMq
7IxLMdajZTGbWLaSKguIEL4KiDEWDhelJ0qJo59aZGCgQFr3TKsVOTs4iovayzvYaoWdDFIYjR4k
4pJICYEppYqcvOfgNPNrmL+bn9PV0Ybyx/qZLbQpAY+MkI0RXS022P5pWsrcpHHlqftgFuBE/Lr3
IhpgtKdrFJxGYDRUZpeQ18yRJ9pgz3CmINwHdn1UaY4baUTzBsYDVp3KUg8GVy7aFbwvvMhaLnIP
rHXDuxVKJuMHT3u7+Ah7hlOugZk9EeVTCy6cAMm2APJywdJ47zCRlGmJIbeQdKgHJ4nnYEkjABC2
9VzxhAtKmYUHBlRp0GyJERNMBWfvOHnhMfVlh19d67HEdnEIAt+6742nCEWt3TlHAndPME1CpbBg
KGZg1ZXeJ9kDBMai5vVVNWT3d91NTG0fw5QBSLLa5f5HTfqO2UAbtNFOinJA0+VMEfIaguAgKgRY
yVVhnXNxzTsO0wFGuRuuxKD986+Jvcdu0TtonyxZzsGZF0xFf2enKzjg7eGbBLM/iaAKIi4WJo39
OpNHad0RIIangYl5sOYCD6UtCq7ctItUBONKbbswPVAcfE0ZYExWGQDbMEEEkuVY0yYJQlf0TJGI
mtskMVQF14VWNo8aJHunT1rBeIGwLvke0Z23UZ2y3xQHThCtQO4wu7OqoAzDqcBjAMxTASbMbshp
AnBka1cN4MBZN8FXr9brUlOhu1znnmkZAeFCkep8uOoISCogqbGZORwkvvFVY19iNJVbonCEfHsd
85pc3BVwIFCCYjrmQPOWsZArxJVrPwhmmUQAczFEwtoxpFAUIzcK463z4ynpwMyB2qRgJYLx2uKk
gOAIVMj4Dcxal9VRJlMLlwSzgw4CGIo1wkZE1uWlQglLZgLpYpTIxkqNyhxxalt4nvKyZKDmxqk0
lRNgNdVYaS2MMOO4NAgqGxJs7Ke0XncvSrsFoVmEyCudSoL5/E/l/i7kinChIQjNlSw=


--===============0438322991==--