From: marko.makela
Date: May 24 2011 8:23pm
Subject: bzr commit into mysql-trunk branch (marko.makela:3107)
List-Archive: http://lists.mysql.com/commits/138019
Message-Id: <201105242024.p4OKO0Ji005241@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2101746047=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC10cnVuay8g
YmFzZWQgb24gcmV2aWQ6YW5pdGhhLmdvcGlAb3JhY2xlLmNvbS0yMDExMDUyNDE2MjgyNC1mZ20w
cno5NWtqZnY4NDI5CgogMzEwNyBNYXJrbyBNw6RrZWzDpAkyMDExLTA1LTI0IFttZXJnZV0KICAg
ICAgTWVyZ2UgbXlzcWwtNS41IHRvIG15c3FsLXRydW5rLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2suYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9sb2Nr
L2xvY2swbG9jay5jCXJldmlkOmFuaXRoYS5nb3BpQG9yYWNsZS5jb20tMjAxMTA1MjQxNjI4MjQt
ZmdtMHJ6OTVramZ2ODQyOQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MjQyMDIyMDgtdTAwbHVxdnF3ZnFj
b2QyZwpAQCAtMzYxLDcgKzM2MSw2IEBAIGlib29sCiBsb2NrX3ZhbGlkYXRlKHZvaWQpOwogLyo9
PT09PT09PT09PT09PT0qLwogCi0jIGlmZGVmIFVOSVZfREVCVUdfTE9DS19WQUxJREFURQogLyoq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKIFZhbGlkYXRlcyB0aGUgcmVjb3JkIGxvY2sgcXVldWVzIG9uIGEgcGFn
ZS4KIEByZXR1cm4JVFJVRSBpZiBvayAqLwpAQCAtMzcxLDcgKzM3MCw2IEBAIGxvY2tfcmVjX3Zh
bGlkYXRlX3BhZ2UoCiAvKj09PT09PT09PT09PT09PT09PT0qLwogCWNvbnN0IGJ1Zl9ibG9ja190
KglibG9jaykJLyohPCBpbjogYnVmZmVyIGJsb2NrICovCiAJX19hdHRyaWJ1dGVfXygobm9ubnVs
bCwgd2Fybl91bnVzZWRfcmVzdWx0KSk7Ci0jIGVuZGlmIC8qIFVOSVZfREVCVUdfTE9DS19WQUxJ
REFURSAqLwogI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KIAogLyogVGhlIGxvY2sgc3lzdGVtICov
CkBAIC01MjIxLDEwICs1MjE5LDEwIEBAIGZ1bmNfZXhpdDoKIC8qKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBW
YWxpZGF0ZXMgdGhlIHJlY29yZCBsb2NrIHF1ZXVlcyBvbiBhIHBhZ2UuCiBAcmV0dXJuCVRSVUUg
aWYgb2sgKi8KLXN0YXRpYyBfX2F0dHJpYnV0ZV9fKChub25udWxsLCB3YXJuX3VudXNlZF9yZXN1
bHQpKQorc3RhdGljCiBpYm9vbAotbG9ja19yZWNfdmFsaWRhdGVfcGFnZV9sb3coCi0vKj09PT09
PT09PT09PT09PT09PT09PT09Ki8KK2xvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UoCisvKj09PT09PT09
PT09PT09PT09PT0qLwogCWNvbnN0IGJ1Zl9ibG9ja190KglibG9jaykJLyohPCBpbjogYnVmZmVy
IGJsb2NrICovCiB7CiAJY29uc3QgbG9ja190Kglsb2NrOwpAQCAtNTIzNywxMSArNTIzNSwxNCBA
QCBsb2NrX3JlY192YWxpZGF0ZV9wYWdlX2xvdygKIAl1bGludCoJCW9mZnNldHMJCT0gb2Zmc2V0
c187CiAJcmVjX29mZnNfaW5pdChvZmZzZXRzXyk7CiAKLQl1dF9hZChsb2NrX211dGV4X293bigp
KTsKKwl1dF9hZCghbG9ja19tdXRleF9vd24oKSk7CiAjaWZkZWYgVU5JVl9TWU5DX0RFQlVHCi0J
dXRfYWQocndfbG9ja19vd24oJnRyeF9zeXMtPmxvY2ssIFJXX0xPQ0tfU0hBUkVEKSk7CisJdXRf
YWQoIXJ3X2xvY2tfb3duKCZ0cnhfc3lzLT5sb2NrLCBSV19MT0NLX1NIQVJFRCkpOworCXV0X2Fk
KCFyd19sb2NrX293bigmdHJ4X3N5cy0+bG9jaywgUldfTE9DS19FWCkpOwogI2VuZGlmIC8qIFVO
SVZfU1lOQ19ERUJVRyAqLwogCisJbG9ja19tdXRleF9lbnRlcigpOworCXJ3X2xvY2tfc19sb2Nr
KCZ0cnhfc3lzLT5sb2NrKTsKIGxvb3A6CiAJbG9jayA9IGxvY2tfcmVjX2dldF9maXJzdF9vbl9w
YWdlX2FkZHIoYnVmX2Jsb2NrX2dldF9zcGFjZShibG9jayksCiAJCQkJCSAgICAgICBidWZfYmxv
Y2tfZ2V0X3BhZ2Vfbm8oYmxvY2spKTsKQEAgLTUyNTAsNiArNTI1MSwxMCBAQCBsb29wOgogCQln
b3RvIGZ1bmN0aW9uX2V4aXQ7CiAJfQogCisjaWYgZGVmaW5lZCBVTklWX0RFQlVHX0ZJTEVfQUND
RVNTRVMgfHwgZGVmaW5lZCBVTklWX0RFQlVHCisJdXRfYSghYmxvY2stPnBhZ2UuZmlsZV9wYWdl
X3dhc19mcmVlZCk7CisjZW5kaWYKKwogCWZvciAoaSA9IDA7IGkgPCBudGhfbG9jazsgaSsrKSB7
CiAKIAkJbG9jayA9IGxvY2tfcmVjX2dldF9uZXh0X29uX3BhZ2VfY29uc3QobG9jayk7CkBAIC01
MzAxLDM0ICs1MzA2LDE1IEBAIGxvb3A6CiAJZ290byBsb29wOwogCiBmdW5jdGlvbl9leGl0Ogor
CWxvY2tfbXV0ZXhfZXhpdCgpOworCXJ3X2xvY2tfc191bmxvY2soJnRyeF9zeXMtPmxvY2spOwor
CiAJaWYgKFVOSVZfTElLRUxZX05VTEwoaGVhcCkpIHsKIAkJbWVtX2hlYXBfZnJlZShoZWFwKTsK
IAl9CiAJcmV0dXJuKFRSVUUpOwogfQogCi0jaWZkZWYgVU5JVl9ERUJVR19MT0NLX1ZBTElEQVRF
Ci0vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqLy8qKgotVmFsaWRhdGVzIHRoZSByZWNvcmQgbG9jayBxdWV1ZXMgb24g
YSBwYWdlLgotQHJldHVybglUUlVFIGlmIG9rICovCi1zdGF0aWMKLWlib29sCi1sb2NrX3JlY192
YWxpZGF0ZV9wYWdlKAotLyo9PT09PT09PT09PT09PT09PT09Ki8KLQljb25zdCBidWZfYmxvY2tf
dCoJYmxvY2spCS8qITwgaW46IGJ1ZmZlciBibG9jayAqLwotewotCWlib29sCXZhbGlkOwotCi0J
bG9ja19tdXRleF9lbnRlcigpOwotCXJ3X2xvY2tfc19sb2NrKCZ0cnhfc3lzLT5sb2NrKTsKLQl2
YWxpZCA9IGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2VfbG93KGJsb2NrKTsKLQlsb2NrX211dGV4X2V4
aXQoKTsKLQlyd19sb2NrX3NfdW5sb2NrKCZ0cnhfc3lzLT5sb2NrKTsKLQotCXJldHVybih2YWxp
ZCk7Ci19Ci0jZW5kaWYgLyogVU5JVl9ERUJVR19MT0NLX1ZBTElEQVRFICovCi0KIC8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKiovLyoqCiBWYWxpZGF0ZXMgdGhlIGxvY2sgc3lzdGVtLgogQHJldHVybglUUlVFIGlmIG9r
ICovCkBAIC01MzkxLDE2ICs1Mzc3LDMwIEBAIGxvY2tfdmFsaWRhdGUodm9pZCkKIAkJCQlicmVh
azsKIAkJCX0KIAorCQkJbG9ja19tdXRleF9leGl0KCk7CisJCQlyd19sb2NrX3NfdW5sb2NrKCZ0
cnhfc3lzLT5sb2NrKTsKKworCQkJLyogVGhlIGxvY2sgYW5kIHRoZSBibG9jayB0aGF0IGl0IGlz
IHJlZmVycmluZworCQkJdG8gbWF5IGJlIGZyZWVkIGF0IHRoaXMgcG9pbnQuIFdlIHBhc3MKKwkJ
CUJVRl9HRVRfUE9TU0lCTFlfRlJFRUQgdG8gc2tpcCBhIGRlYnVnIGNoZWNrLgorCQkJSWYgdGhl
IGxvY2sgZXhpc3RzIGluIGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2UoKQorCQkJd2UgYXNzZXJ0ICFi
bG9jay0+cGFnZS5maWxlX3BhZ2Vfd2FzX2ZyZWVkLiAqLworCiAJCQltdHJfc3RhcnQoJm10cik7
Ci0JCQlibG9jayA9IGJ1Zl9wYWdlX2dldCgKKwkJCWJsb2NrID0gYnVmX3BhZ2VfZ2V0X2dlbigK
IAkJCQlzcGFjZSwgZmlsX3NwYWNlX2dldF96aXBfc2l6ZShzcGFjZSksCi0JCQkJcGFnZV9ubywg
UldfWF9MQVRDSCwgJm10cik7CisJCQkJcGFnZV9ubywgUldfWF9MQVRDSCwgTlVMTCwKKwkJCQlC
VUZfR0VUX1BPU1NJQkxZX0ZSRUVELAorCQkJCV9fRklMRV9fLCBfX0xJTkVfXywgJm10cik7CiAJ
CQlidWZfYmxvY2tfZGJnX2FkZF9sZXZlbChibG9jaywgU1lOQ19OT19PUkRFUl9DSEVDSyk7CiAK
LQkJCXV0X2FkKGxvY2tfcmVjX3ZhbGlkYXRlX3BhZ2VfbG93KGJsb2NrKSk7CisJCQl1dF9hZChs
b2NrX3JlY192YWxpZGF0ZV9wYWdlKGJsb2NrKSk7CiAJCQltdHJfY29tbWl0KCZtdHIpOwogCiAJ
CQlsaW1pdCsrOworCisJCQlsb2NrX211dGV4X2VudGVyKCk7CisJCQlyd19sb2NrX3NfbG9jaygm
dHJ4X3N5cy0+bG9jayk7CiAJCX0KIAl9CiAKCg==

--===============2101746047==
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-trunk/
# testament_sha1: 054016c71b8e575e12dea74f2ba8523cf45fda0b
# timestamp: 2011-05-24 23:23:45 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# base_revision_id: anitha.gopi@stripped\
#   fgm0rz95kjfv8429
# 
# Begin bundle
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
KWeB2lwOPr2P8GQ9Z/xdyRThQkJtdsvM


--===============2101746047==--