From: marko.makela
Date: May 24 2011 8:08pm
Subject: bzr commit into mysql-5.5 branch (marko.makela:3400) Bug#12584374
List-Archive: http://lists.mysql.com/commits/138018
X-Bug: 12584374
Message-Id: <201105242008.p4OK8Wi6012880@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1760465220=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC01LjUvIGJh
c2VkIG9uIHJldmlkOmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA1MjQxNjI3NTUtMTR5N3Mw
aHh6aGZ0cG1sagoKIDM0MDAgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0yNAogICAgICBCdWcjMTI1
ODQzNzQgTE9DS19WQUxJREFURSBUUklQUyBBU1NFUlRJT04gIUJMT0NLLT5QQUdFLkZJTEVfUEFH
RV9XQVNfRlJFRQogICAgICAKICAgICAgRml4IGEgZGVhZGxvY2sgaW4gdGhlIGluaXRpYWwgcGF0
Y2guIGxvY2tfdmFsaWRhdGUoKSBtdXN0IG5vdCBob2xkIHRoZQogICAgICBsb2NrIHN5c3RlbSBt
dXRleCB3aGlsZSBzLWxhdGNoaW5nIGEgYmxvY2ssIGJlY2F1c2Ugc29tZSBmdW5jdGlvbnMsCiAg
ICAgIHN1Y2ggYXMgbG9ja19yZWNfY29udmVydF9pbXBsX3RvX2V4cGwoKSwgbWF5IGJlIGFscmVh
ZHkgaG9sZGluZyBhbiB4LWxhdGNoCiAgICAgIG9uIHRoZSBibG9jayB0aGF0IGxvY2tfdmFsaWRh
dGUoKSBpcyBpbnRlcmVzdGVkIGluIHdoaWxlIGF0dGVtcHRpbmcgdG8KICAgICAgYWNxdWlyZSB0
aGUgbG9jayBzeXN0ZW0gbXV0ZXguCiAgICAgIAogICAgICBUaGlzIGRlYWRsb2NrIHdhcyBub3Qg
Y2F1Z2h0IGJ5IFVOSVZfU1lOQ19ERUJVRyBiZWNhdXNlIG9mCiAgICAgIGJ1Zl9ibG9ja19kYmdf
YWRkX2xldmVsKGJsb2NrLCBTWU5DX05PX09SREVSX0NIRUNLKS4KCiAgICBtb2RpZmllZDoKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
bG9jay9sb2NrMGxvY2suYwlyZXZpZDphbml0aGEuZ29waUBvcmFjbGUuY29tLTIwMTEwNTI0MTYy
NzU1LTE0eTdzMGh4emhmdHBtbGoKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9j
ay5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTI0MjAwODIyLXUzbThkZ3Ez
M3cxNWFiZnEKQEAgLTM1Miw3ICszNTIsNiBAQCBpYm9vbAogbG9ja192YWxpZGF0ZSh2b2lkKTsK
IC8qPT09PT09PT09PT09PT09Ki8KIAotIyBpZmRlZiBVTklWX0RFQlVHX0xPQ0tfVkFMSURBVEUK
IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKiovLyoqCiBWYWxpZGF0ZXMgdGhlIHJlY29yZCBsb2NrIHF1ZXVlcyBvbiBh
IHBhZ2UuCiBAcmV0dXJuCVRSVUUgaWYgb2sgKi8KQEAgLTM2Miw3ICszNjEsNiBAQCBsb2NrX3Jl
Y192YWxpZGF0ZV9wYWdlKAogLyo9PT09PT09PT09PT09PT09PT09Ki8KIAljb25zdCBidWZfYmxv
Y2tfdCoJYmxvY2spCS8qITwgaW46IGJ1ZmZlciBibG9jayAqLwogCV9fYXR0cmlidXRlX18oKG5v
bm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOwotIyBlbmRpZiAvKiBVTklWX0RFQlVHX0xPQ0tf
VkFMSURBVEUgKi8KICNlbmRpZiAvKiBVTklWX0RFQlVHICovCiAKIC8qIFRoZSBsb2NrIHN5c3Rl
bSAqLwpAQCAtNDg2NSwxMCArNDg2MywxMCBAQCBsb2NrX3JlY19xdWV1ZV92YWxpZGF0ZSgKIC8q
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKiovLyoqCiBWYWxpZGF0ZXMgdGhlIHJlY29yZCBsb2NrIHF1ZXVlcyBvbiBhIHBh
Z2UuCiBAcmV0dXJuCVRSVUUgaWYgb2sgKi8KLXN0YXRpYyBfX2F0dHJpYnV0ZV9fKChub25udWxs
LCB3YXJuX3VudXNlZF9yZXN1bHQpKQorc3RhdGljCiBpYm9vbAotbG9ja19yZWNfdmFsaWRhdGVf
cGFnZV9sb3coCi0vKj09PT09PT09PT09PT09PT09PT09PT09Ki8KK2xvY2tfcmVjX3ZhbGlkYXRl
X3BhZ2UoCisvKj09PT09PT09PT09PT09PT09PT0qLwogCWNvbnN0IGJ1Zl9ibG9ja190KglibG9j
aykJLyohPCBpbjogYnVmZmVyIGJsb2NrICovCiB7CiAJY29uc3QgbG9ja190Kglsb2NrOwpAQCAt
NDg4MSw5ICs0ODc5LDEwIEBAIGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2VfbG93KAogCXVsaW50KgkJ
b2Zmc2V0cwkJPSBvZmZzZXRzXzsKIAlyZWNfb2Zmc19pbml0KG9mZnNldHNfKTsKIAotCXV0X2Fk
KG11dGV4X293bigma2VybmVsX211dGV4KSk7CisJdXRfYWQoIW11dGV4X293bigma2VybmVsX211
dGV4KSk7CiAJdXRfYWQoYnVmX2Jsb2NrX2dldF9zdGF0ZShibG9jaykgPT0gQlVGX0JMT0NLX0ZJ
TEVfUEFHRSk7CiAKKwlsb2NrX211dGV4X2VudGVyX2tlcm5lbCgpOwogbG9vcDoKIAlsb2NrID0g
bG9ja19yZWNfZ2V0X2ZpcnN0X29uX3BhZ2VfYWRkcihidWZfYmxvY2tfZ2V0X3NwYWNlKGJsb2Nr
KSwKIAkJCQkJICAgICAgIGJ1Zl9ibG9ja19nZXRfcGFnZV9ubyhibG9jaykpOwpAQCAtNDg5Miw2
ICs0ODkxLDEwIEBAIGxvb3A6CiAJCWdvdG8gZnVuY3Rpb25fZXhpdDsKIAl9CiAKKyNpZiBkZWZp
bmVkIFVOSVZfREVCVUdfRklMRV9BQ0NFU1NFUyB8fCBkZWZpbmVkIFVOSVZfREVCVUcKKwl1dF9h
KCFibG9jay0+cGFnZS5maWxlX3BhZ2Vfd2FzX2ZyZWVkKTsKKyNlbmRpZgorCiAJZm9yIChpID0g
MDsgaSA8IG50aF9sb2NrOyBpKyspIHsKIAogCQlsb2NrID0gbG9ja19yZWNfZ2V0X25leHRfb25f
cGFnZV9jb25zdChsb2NrKTsKQEAgLTQ5NTAsMzIgKzQ5NTMsMTQgQEAgbG9vcDoKIAlnb3RvIGxv
b3A7CiAKIGZ1bmN0aW9uX2V4aXQ6CisJbG9ja19tdXRleF9leGl0X2tlcm5lbCgpOworCiAJaWYg
KFVOSVZfTElLRUxZX05VTEwoaGVhcCkpIHsKIAkJbWVtX2hlYXBfZnJlZShoZWFwKTsKIAl9CiAJ
cmV0dXJuKFRSVUUpOwogfQogCi0jaWZkZWYgVU5JVl9ERUJVR19MT0NLX1ZBTElEQVRFCi0vKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqLy8qKgotVmFsaWRhdGVzIHRoZSByZWNvcmQgbG9jayBxdWV1ZXMgb24gYSBwYWdl
LgotQHJldHVybglUUlVFIGlmIG9rICovCi1zdGF0aWMKLWlib29sCi1sb2NrX3JlY192YWxpZGF0
ZV9wYWdlKAotLyo9PT09PT09PT09PT09PT09PT09Ki8KLQljb25zdCBidWZfYmxvY2tfdCoJYmxv
Y2spCS8qITwgaW46IGJ1ZmZlciBibG9jayAqLwotewotCWlib29sCXZhbGlkOwotCi0JbG9ja19t
dXRleF9lbnRlcl9rZXJuZWwoKTsKLQl2YWxpZCA9IGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2VfbG93
KGJsb2NrKTsKLQlsb2NrX211dGV4X2V4aXRfa2VybmVsKCk7Ci0KLQlyZXR1cm4odmFsaWQpOwot
fQotI2VuZGlmIC8qIFVOSVZfREVCVUdfTE9DS19WQUxJREFURSAqLwotCiAvKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ly8qKgogVmFsaWRhdGVzIHRoZSBsb2NrIHN5c3RlbS4KIEByZXR1cm4JVFJVRSBpZiBvayAqLwpA
QCAtNTA0MSwxNiArNTAyNiwyOCBAQCBsb2NrX3ZhbGlkYXRlKHZvaWQpCiAJCQkJYnJlYWs7CiAJ
CQl9CiAKKwkJCWxvY2tfbXV0ZXhfZXhpdF9rZXJuZWwoKTsKKworCQkJLyogVGhlIGxvY2sgYW5k
IHRoZSBibG9jayB0aGF0IGl0IGlzIHJlZmVycmluZworCQkJdG8gbWF5IGJlIGZyZWVkIGF0IHRo
aXMgcG9pbnQuIFdlIHBhc3MKKwkJCUJVRl9HRVRfUE9TU0lCTFlfRlJFRUQgdG8gc2tpcCBhIGRl
YnVnIGNoZWNrLgorCQkJSWYgdGhlIGxvY2sgZXhpc3RzIGluIGxvY2tfcmVjX3ZhbGlkYXRlX3Bh
Z2UoKQorCQkJd2UgYXNzZXJ0ICFibG9jay0+cGFnZS5maWxlX3BhZ2Vfd2FzX2ZyZWVkLiAqLwor
CiAJCQltdHJfc3RhcnQoJm10cik7Ci0JCQlibG9jayA9IGJ1Zl9wYWdlX2dldCgKKwkJCWJsb2Nr
ID0gYnVmX3BhZ2VfZ2V0X2dlbigKIAkJCQlzcGFjZSwgZmlsX3NwYWNlX2dldF96aXBfc2l6ZShz
cGFjZSksCi0JCQkJcGFnZV9ubywgUldfWF9MQVRDSCwgJm10cik7CisJCQkJcGFnZV9ubywgUldf
WF9MQVRDSCwgTlVMTCwKKwkJCQlCVUZfR0VUX1BPU1NJQkxZX0ZSRUVELAorCQkJCV9fRklMRV9f
LCBfX0xJTkVfXywgJm10cik7CiAJCQlidWZfYmxvY2tfZGJnX2FkZF9sZXZlbChibG9jaywgU1lO
Q19OT19PUkRFUl9DSEVDSyk7CiAKLQkJCXV0X2FkKGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2VfbG93
KGJsb2NrKSk7CisJCQl1dF9hZChsb2NrX3JlY192YWxpZGF0ZV9wYWdlKGJsb2NrKSk7CiAJCQlt
dHJfY29tbWl0KCZtdHIpOwogCiAJCQlsaW1pdCsrOworCisJCQlsb2NrX211dGV4X2VudGVyX2tl
cm5lbCgpOwogCQl9CiAJfQogCgo=

--===============1760465220==
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: 20d83c11e822b3e34f83109be1939487502e57ea
# timestamp: 2011-05-24 23:08:28 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: anitha.gopi@stripped\
#   14y7s0hxzhftpmlj
# 
# Begin bundle
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
FOFCQDTuyXw=


--===============1760465220==--