From: marko.makela
Date: May 24 2011 8:45am
Subject: bzr push into mysql-5.5 branch (marko.makela:3394 to 3395) Bug#58815
 Bug#11765812
List-Archive: http://lists.mysql.com/commits/137944
X-Bug: 58815,11765812
Message-Id: <201105240845.p4O8j8ou005264@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1099556052=="

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

IDMzOTUgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0yNAogICAgICBCYWNrcG9ydCBhbiBJbm5vREIg
QnVnICM1ODgxNSAoQnVnICMxMTc2NTgxMikgd29yay1hcm91bmQgZnJvbSBteXNxbC10cnVuazoK
ICAgICAgCiAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLQogICAgICByZXZubyAyODc2LjI0NC4zMDUKICAgICAgcmV2aXNpb24g
aWQgbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MTMwODIyMTEtZTZvdWhqejVybXF4Y3Fh
cAogICAgICBwYXJlbnQgIG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDEzMDc1OTQ4LWt2
eXRtYzM3eWUxbnQ3ZDkKICAgICAgY29tbWl0dGVyICBNYXJrbyBNw6RrZWzDpCA8bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20+CiAgICAgIGJyYW5jaCBuaWNrIDUuNi1pbm5vZGIKICAgICAgdGltZXN0
YW1wIFdlZCAyMDExLTA0LTEzIDExOjIyOjExICswMzAwCiAgICAgIG1lc3NhZ2U6CiAgICAgICAg
U3VwcHJlc3MgdGhlIEJ1ZyAjNTg4MTUgKEJ1ZyAjMTE3NjU4MTIpIGFzc2VydGlvbiBmYWlsdXJl
LgogICAgICAKICAgICAgICBidWZfcGFnZV9nZXRfZ2VuKCk6IEludHJvZHVjZSBCVUZfR0VUX1BP
U1NJQkxZX0ZSRUVEIGZvciBzdXBwcmVzc2luZyB0aGUKICAgICAgICBjaGVjayB0aGF0IHRoZSBm
aWxlIHBhZ2UgbXVzdCBub3QgaGF2ZSBiZWVuIGZyZWVkLgogICAgICAKICAgICAgICBidHJfZXN0
aW1hdGVfbl9yb3dzX2luX3JhbmdlX29uX2xldmVsKCk6IFBhc3MgQlVGX0dFVF9QT1NTSUJMWV9G
UkVFRCBhbmQKICAgICAgICBleHBsYWluIGluIHRoZSBjb21tZW50cyB3aHkgdGhpcyBpcyBuZWVk
ZWQgYW5kIHdoeSBpdCBzaG91bGQgYmUgbW9zdGx5CiAgICAgICAgaGFybWxlc3MgdG8gaWdub3Jl
IHRoZSBwcm9ibGVtLiBJZiBJbm5vREIgaGFkIGFsd2F5cyBpbml0aWFsaXplZCBhbGwKICAgICAg
ICB1bnVzZWQgZmllbGRzIGluIGRhdGEgZmlsZXMsIG5vIHByb2JsZW0gd291bGQgZXhpc3QuCiAg
ICAgIAogICAgICAgIFRoaXMgY2hhbmdlIGRvZXMgbm90IGZpeCB0aGUgYnVnLCBpdCBqdXN0ICJz
aG9vdHMgdGhlIG1lc3NlbmdlciIuCiAgICAgIAogICAgICAgIHJiOjY0NyBhcHByb3ZlZCBieSBK
aW1teSBZYW5nCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBj
dXIuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVmLmMKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYuaAogMzM5NCBMdWlzIFNvYXJlcwkyMDExLTA1LTI0IFtt
ZXJnZV0KICAgICAgQlVHIzEyNTU4NTE5CiAgICAgIAogICAgICBBdXRvbWVyZ2VkIGJ6ciBidW5k
bGUgZnJvbSBidWcgcmVwb3J0IGludG8gbGF0ZXN0IG15c3FsLTUuNS4KCiAgICBtb2RpZmllZDoK
ICAgICAgc3FsL2xvZ19ldmVudC5jYwogICAgICBzcWwvcnBsX3JsaS5jYwogICAgICBzcWwvdGFi
bGUuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYycK
LS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCXJldmlkOmx1aXMuc29hcmVzQG9y
YWNsZS5jb20tMjAxMTA1MjMyMzMzNTUtY3VianIydGVvN213cWd2cworKysgYi9zdG9yYWdlL2lu
bm9iYXNlL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1
MjQwODQxMzEtanRtMnBvZnlkMGc3NW50MwpAQCAtMzI2NCw5ICszMjY0LDE0IEBAIGJ0cl9lc3Rp
bWF0ZV9uX3Jvd3NfaW5fcmFuZ2Vfb25fbGV2ZWwoCiAKIAkJbXRyX3N0YXJ0KCZtdHIpOwogCi0J
CS8qIGZldGNoIHRoZSBwYWdlICovCi0JCWJsb2NrID0gYnVmX3BhZ2VfZ2V0KHNwYWNlLCB6aXBf
c2l6ZSwgcGFnZV9ubywgUldfU19MQVRDSCwKLQkJCQkgICAgICZtdHIpOworCQkvKiBGZXRjaCB0
aGUgcGFnZS4gQmVjYXVzZSB3ZSBhcmUgbm90IGhvbGRpbmcgdGhlCisJCWluZGV4LT5sb2NrLCB0
aGUgdHJlZSBtYXkgaGF2ZSBjaGFuZ2VkIGFuZCB3ZSBtYXkgYmUKKwkJYXR0ZW1wdGluZyB0byBy
ZWFkIGEgcGFnZSB0aGF0IGlzIG5vIGxvbmdlciBwYXJ0IG9mCisJCXRoZSBCLXRyZWUuIFdlIHBh
c3MgQlVGX0dFVF9QT1NTSUJMWV9GUkVFRCBpbiBvcmRlciB0bworCQlzaWxlbmNlIGEgZGVidWcg
YXNzZXJ0aW9uIGFib3V0IHRoaXMuICovCisJCWJsb2NrID0gYnVmX3BhZ2VfZ2V0X2dlbihzcGFj
ZSwgemlwX3NpemUsIHBhZ2Vfbm8sIFJXX1NfTEFUQ0gsCisJCQkJCSBOVUxMLCBCVUZfR0VUX1BP
U1NJQkxZX0ZSRUVELAorCQkJCQkgX19GSUxFX18sIF9fTElORV9fLCAmbXRyKTsKIAogCQlwYWdl
ID0gYnVmX2Jsb2NrX2dldF9mcmFtZShibG9jayk7CiAKQEAgLTMyODUsNiArMzI5MCwxMyBAQCBi
dHJfZXN0aW1hdGVfbl9yb3dzX2luX3JhbmdlX29uX2xldmVsKAogCQkJZ290byBpbmV4YWN0Owog
CQl9CiAKKwkJLyogSXQgaXMgcG9zc2libGUgYnV0IGhpZ2hseSB1bmxpa2VseSB0aGF0IHRoZSBw
YWdlIHdhcworCQlvcmlnaW5hbGx5IHdyaXR0ZW4gYnkgYW4gb2xkIHZlcnNpb24gb2YgSW5ub0RC
IHRoYXQgZGlkCisJCW5vdCBpbml0aWFsaXplIEZJTF9QQUdFX1RZUEUgb24gb3RoZXIgdGhhbiBC
LXRyZWUgcGFnZXMuCisJCUZvciBleGFtcGxlLCB0aGlzIGNvdWxkIGJlIGFuIGFsbW9zdC1lbXB0
eSBCTE9CIHBhZ2UKKwkJdGhhdCBoYXBwZW5zIHRvIGNvbnRhaW4gdGhlIG1hZ2ljIHZhbHVlcyBp
biB0aGUgZmllbGRzCisJCXRoYXQgd2UgY2hlY2tlZCBhYm92ZS4gKi8KKwogCQluX3BhZ2VzX3Jl
YWQrKzsKIAogCQlpZiAocGFnZV9ubyAhPSBzbG90MS0+cGFnZV9ubykgewoKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYycKLS0tIGEvc3RvcmFnZS9pbm5v
YmFzZS9idWYvYnVmMGJ1Zi5jCXJldmlkOmx1aXMuc29hcmVzQG9yYWNsZS5jb20tMjAxMTA1MjMy
MzMzNTUtY3VianIydGVvN213cWd2cworKysgYi9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVm
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MjQwODQxMzEtanRtMnBvZnlk
MGc3NW50MwpAQCAtMjc0Nyw2ICsyNzQ3LDcgQEAgYnVmX3BhZ2VfZ2V0X2dlbigKIAljYXNlIEJV
Rl9HRVRfSUZfSU5fUE9PTDoKIAljYXNlIEJVRl9QRUVLX0lGX0lOX1BPT0w6CiAJY2FzZSBCVUZf
R0VUX0lGX0lOX1BPT0xfT1JfV0FUQ0g6CisJY2FzZSBCVUZfR0VUX1BPU1NJQkxZX0ZSRUVEOgog
CQlicmVhazsKIAlkZWZhdWx0OgogCQl1dF9lcnJvcjsKQEAgLTMwNjIsNyArMzA2MywxMCBAQCB3
YWl0X3VudGlsX3VuZml4ZWQ6CiAjZW5kaWYgLyogVU5JVl9ERUJVRyB8fCBVTklWX0lCVUZfREVC
VUcgKi8KIAogCWJ1Zl9ibG9ja19idWZfZml4X2luYyhibG9jaywgZmlsZSwgbGluZSk7Ci0KKyNp
ZiBkZWZpbmVkIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUyB8fCBkZWZpbmVkIFVOSVZfREVCVUcK
Kwl1dF9hKG1vZGUgPT0gQlVGX0dFVF9QT1NTSUJMWV9GUkVFRAorCSAgICAgfHwgIWJsb2NrLT5w
YWdlLmZpbGVfcGFnZV93YXNfZnJlZWQpOworI2VuZGlmCiAJbXV0ZXhfZXhpdCgmYmxvY2stPm11
dGV4KTsKIAogCS8qIENoZWNrIGlmIHRoaXMgaXMgdGhlIGZpcnN0IGFjY2VzcyB0byB0aGUgcGFn
ZSAqLwpAQCAtMzA3NSwxMCArMzA3OSw2IEBAIHdhaXRfdW50aWxfdW5maXhlZDoKIAkJYnVmX3Bh
Z2Vfc2V0X2FjY2Vzc2VkX21ha2VfeW91bmcoJmJsb2NrLT5wYWdlLCBhY2Nlc3NfdGltZSk7CiAJ
fQogCi0jaWYgZGVmaW5lZCBVTklWX0RFQlVHX0ZJTEVfQUNDRVNTRVMgfHwgZGVmaW5lZCBVTklW
X0RFQlVHCi0JdXRfYSghYmxvY2stPnBhZ2UuZmlsZV9wYWdlX3dhc19mcmVlZCk7Ci0jZW5kaWYK
LQogI2lmIGRlZmluZWQgVU5JVl9ERUJVRyB8fCBkZWZpbmVkIFVOSVZfQlVGX0RFQlVHCiAJdXRf
YSgrK2J1Zl9kYmdfY291bnRlciAlIDU3NzEgfHwgYnVmX3ZhbGlkYXRlKCkpOwogCXV0X2EoYmxv
Y2stPnBhZ2UuYnVmX2ZpeF9jb3VudCA+IDApOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVmLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9idWYwYnVmLmgJcmV2aWQ6bHVpcy5zb2FyZXNAb3JhY2xlLmNvbS0yMDExMDUyMzIzMzM1NS1j
dWJqcjJ0ZW83bXdxZ3ZzCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idWYwYnVmLmgJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MjQwODQxMzEtanRtMnBvZnlkMGc3
NW50MwpAQCAtNTMsNiArNTMsOSBAQCBDcmVhdGVkIDExLzUvMTk5NSBIZWlra2kgVHV1cmkKIAkJ
CQkJLyohPCBHZXQgdGhlIHBhZ2Ugb25seSBpZiBpdCdzIGluIHRoZQogCQkJCQlidWZmZXIgcG9v
bCwgaWYgbm90IHRoZW4gc2V0IGEgd2F0Y2gKIAkJCQkJb24gdGhlIHBhZ2UuICovCisjZGVmaW5l
IEJVRl9HRVRfUE9TU0lCTFlfRlJFRUQJCTE2CisJCQkJCS8qITwgTGlrZSBCVUZfR0VULCBidXQg
ZG8gbm90IG1pbmQKKwkJCQkJaWYgdGhlIGZpbGUgcGFnZSBoYXMgYmVlbiBmcmVlZC4gKi8KIC8q
IEB9ICovCiAvKiogQG5hbWUgTW9kZXMgZm9yIGJ1Zl9wYWdlX2dldF9rbm93bl9ub3dhaXQgKi8K
IC8qIEB7ICovCgo=

--===============1099556052==
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/mysql-5.5/
# testament_sha1: 841d57c79c917790c38b2d3b1b4d6095437ba2ce
# timestamp: 2011-05-24 11:45:04 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: luis.soares@stripped\
#   cubjr2teo7mwqgvs
# 
# Begin bundle
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
L5iA


--===============1099556052==--