From: marko.makela
Date: April 13 2011 8:22am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3579) Bug#58815
 Bug#11765812
List-Archive: http://lists.mysql.com/commits/135312
X-Bug: 58815,11765812
Message-Id: <201104130822.p3D8MRq6001074@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1543816051=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQxMzA3NTk0OC1rdnl0
bWMzN3llMW50N2Q5CgogMzU3OSBNYXJrbyBNw6RrZWzDpAkyMDExLTA0LTEzCiAgICAgIFN1cHBy
ZXNzIHRoZSBCdWcgIzU4ODE1IChCdWcgIzExNzY1ODEyKSBhc3NlcnRpb24gZmFpbHVyZS4KICAg
ICAgCiAgICAgIGJ1Zl9wYWdlX2dldF9nZW4oKTogSW50cm9kdWNlIEJVRl9HRVRfUE9TU0lCTFlf
RlJFRUQgZm9yIHN1cHByZXNzaW5nIHRoZQogICAgICBjaGVjayB0aGF0IHRoZSBmaWxlIHBhZ2Ug
bXVzdCBub3QgaGF2ZSBiZWVuIGZyZWVkLgogICAgICAKICAgICAgYnRyX2VzdGltYXRlX25fcm93
c19pbl9yYW5nZV9vbl9sZXZlbCgpOiBQYXNzIEJVRl9HRVRfUE9TU0lCTFlfRlJFRUQgYW5kCiAg
ICAgIGV4cGxhaW4gaW4gdGhlIGNvbW1lbnRzIHdoeSB0aGlzIGlzIG5lZWRlZCBhbmQgd2h5IGl0
IHNob3VsZCBiZSBtb3N0bHkKICAgICAgaGFybWxlc3MgdG8gaWdub3JlIHRoZSBwcm9ibGVtLiBJ
ZiBJbm5vREIgaGFkIGFsd2F5cyBpbml0aWFsaXplZCBhbGwKICAgICAgdW51c2VkIGZpZWxkcyBp
biBkYXRhIGZpbGVzLCBubyBwcm9ibGVtIHdvdWxkIGV4aXN0LgogICAgICAKICAgICAgVGhpcyBj
aGFuZ2UgZG9lcyBub3QgZml4IHRoZSBidWcsIGl0IGp1c3QgInNob290cyB0aGUgbWVzc2VuZ2Vy
Ii4KICAgICAgCiAgICAgIHJiOjY0NyBhcHByb3ZlZCBieSBKaW1teSBZYW5nCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwogICAgICBzdG9yYWdlL2lu
bm9iYXNlL2J1Zi9idWYwYnVmLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBi
dWYuaAo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA0MTMwNzU5NDgta3Z5dG1jMzd5ZTFudDdkOQorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0
MTMwODIyMTEtZTZvdWhqejVybXF4Y3FhcApAQCAtMzI2NCw5ICszMjY0LDE0IEBAIGJ0cl9lc3Rp
bWF0ZV9uX3Jvd3NfaW5fcmFuZ2Vfb25fbGV2ZWwoCiAKIAkJbXRyX3N0YXJ0KCZtdHIpOwogCi0J
CS8qIGZldGNoIHRoZSBwYWdlICovCi0JCWJsb2NrID0gYnVmX3BhZ2VfZ2V0KHNwYWNlLCB6aXBf
c2l6ZSwgcGFnZV9ubywgUldfU19MQVRDSCwKLQkJCQkgICAgICZtdHIpOworCQkvKiBGZXRjaCB0
aGUgcGFnZS4gQmVjYXVzZSB3ZSBhcmUgbm90IGhvbGRpbmcgdGhlCisJCWluZGV4LT5sb2NrLCB0
aGUgdHJlZSBtYXkgaGF2ZSBjaGFuZ2VkIGFuZCB3ZSBtYXkgYmUKKwkJYXR0ZW1wdGluZyB0byBy
ZWFkIGEgcGFnZSB0aGF0IGlzIG5vIGxvbmdlciBwYXJ0IG9mCisJCXRoZSBCLXRyZWUuIFdlIHBh
c3MgQlVGX0dFVF9QT1NTSUJMWV9GUkVFRCBpbiBvcmRlciB0bworCQlzaWxlbmNlIGEgZGVidWcg
YXNzZXJ0aW9uIGFib3V0IHRoaXMuICovCisJCWJsb2NrID0gYnVmX3BhZ2VfZ2V0X2dlbihzcGFj
ZSwgemlwX3NpemUsIHBhZ2Vfbm8sIFJXX1NfTEFUQ0gsCisJCQkJCSBOVUxMLCBCVUZfR0VUX1BP
U1NJQkxZX0ZSRUVELAorCQkJCQkgX19GSUxFX18sIF9fTElORV9fLCAmbXRyKTsKIAogCQlwYWdl
ID0gYnVmX2Jsb2NrX2dldF9mcmFtZShibG9jayk7CiAKQEAgLTMyODUsNiArMzI5MCwxMyBAQCBi
dHJfZXN0aW1hdGVfbl9yb3dzX2luX3JhbmdlX29uX2xldmVsKAogCQkJZ290byBpbmV4YWN0Owog
CQl9CiAKKwkJLyogSXQgaXMgcG9zc2libGUgYnV0IGhpZ2hseSB1bmxpa2VseSB0aGF0IHRoZSBw
YWdlIHdhcworCQlvcmlnaW5hbGx5IHdyaXR0ZW4gYnkgYW4gb2xkIHZlcnNpb24gb2YgSW5ub0RC
IHRoYXQgZGlkCisJCW5vdCBpbml0aWFsaXplIEZJTF9QQUdFX1RZUEUgb24gb3RoZXIgdGhhbiBC
LXRyZWUgcGFnZXMuCisJCUZvciBleGFtcGxlLCB0aGlzIGNvdWxkIGJlIGFuIGFsbW9zdC1lbXB0
eSBCTE9CIHBhZ2UKKwkJdGhhdCBoYXBwZW5zIHRvIGNvbnRhaW4gdGhlIG1hZ2ljIHZhbHVlcyBp
biB0aGUgZmllbGRzCisJCXRoYXQgd2UgY2hlY2tlZCBhYm92ZS4gKi8KKwogCQluX3BhZ2VzX3Jl
YWQrKzsKIAogCQlpZiAocGFnZV9ubyAhPSBzbG90MS0+cGFnZV9ubykgewoKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5v
YmFzZS9idWYvYnVmMGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDEz
MDc1OTQ4LWt2eXRtYzM3eWUxbnQ3ZDkKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1
Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDEzMDgyMjExLWU2b3Voano1
cm1xeGNxYXAKQEAgLTI5MDIsNiArMjkwMiw3IEBAIGJ1Zl9wYWdlX2dldF9nZW4oCiAJY2FzZSBC
VUZfR0VUX0lGX0lOX1BPT0w6CiAJY2FzZSBCVUZfUEVFS19JRl9JTl9QT09MOgogCWNhc2UgQlVG
X0dFVF9JRl9JTl9QT09MX09SX1dBVENIOgorCWNhc2UgQlVGX0dFVF9QT1NTSUJMWV9GUkVFRDoK
IAkJYnJlYWs7CiAJZGVmYXVsdDoKIAkJdXRfZXJyb3I7CkBAIC0zMjg1LDcgKzMyODYsOCBAQCB3
YWl0X3VudGlsX3VuZml4ZWQ6CiAKIAlidWZfYmxvY2tfYnVmX2ZpeF9pbmMoYmxvY2ssIGZpbGUs
IGxpbmUpOwogI2lmIGRlZmluZWQgVU5JVl9ERUJVR19GSUxFX0FDQ0VTU0VTIHx8IGRlZmluZWQg
VU5JVl9ERUJVRwotCXV0X2EoIWJsb2NrLT5wYWdlLmZpbGVfcGFnZV93YXNfZnJlZWQpOworCXV0
X2EobW9kZSA9PSBCVUZfR0VUX1BPU1NJQkxZX0ZSRUVECisJICAgICB8fCAhYmxvY2stPnBhZ2Uu
ZmlsZV9wYWdlX3dhc19mcmVlZCk7CiAjZW5kaWYKIAltdXRleF9leGl0KCZibG9jay0+bXV0ZXgp
OwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYu
aCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYuaAlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDExMDQxMzA3NTk0OC1rdnl0bWMzN3llMW50N2Q5CisrKyBiL3N0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVmLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTA0MTMwODIyMTEtZTZvdWhqejVybXF4Y3FhcApAQCAtNTQsNiArNTQsOSBAQCBD
cmVhdGVkIDExLzUvMTk5NSBIZWlra2kgVHV1cmkKIAkJCQkJLyohPCBHZXQgdGhlIHBhZ2Ugb25s
eSBpZiBpdCdzIGluIHRoZQogCQkJCQlidWZmZXIgcG9vbCwgaWYgbm90IHRoZW4gc2V0IGEgd2F0
Y2gKIAkJCQkJb24gdGhlIHBhZ2UuICovCisjZGVmaW5lIEJVRl9HRVRfUE9TU0lCTFlfRlJFRUQJ
CTE2CisJCQkJCS8qITwgTGlrZSBCVUZfR0VULCBidXQgZG8gbm90IG1pbmQKKwkJCQkJaWYgdGhl
IGZpbGUgcGFnZSBoYXMgYmVlbiBmcmVlZC4gKi8KIC8qIEB9ICovCiAvKiogQG5hbWUgTW9kZXMg
Zm9yIGJ1Zl9wYWdlX2dldF9rbm93bl9ub3dhaXQgKi8KIC8qIEB7ICovCgo=

--===============1543816051==
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: 7bc0296cb186b826a2ab788413c5823a4b62c054
# timestamp: 2011-04-13 11:22:19 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   kvytmc37ye1nt7d9
# 
# Begin bundle
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


--===============1543816051==--