From: marko.makela
Date: June 1 2010 10:37am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3488) Bug#53812
List-Archive: http://lists.mysql.com/commits/109693
X-Bug: 53812
Message-Id: <201006011037.o51Aasw9016172@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1357149181=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNTMxMTYzNTQwLTlmdTNw
cmJuMmFzcXdkaTUKCiAzNDg4IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYtMDEKICAgICAgQnVnIzUz
ODEyOiBhc3NlcnQgcm93L3JvdzB1bW9kLmMgbGluZSA2NjAgaW4gdHhuIHJvbGxiYWNrIGFmdGVy
IGNyYXNoIHJlY292ZXJ5CiAgICAgIAogICAgICByb3dfdW5kb19tb2RfdXBkX2V4aXN0X3NlYygp
OiBUb2xlcmF0ZSBhIGZhaWx1cmUgdG8gYnVpbGQgdGhlIGluZGV4IGVudHJ5CiAgICAgIGZvciBh
IERZTkFNSUMgb3IgQ09NUFJFU1NFRCB0YWJsZSBkdXJpbmcgY3Jhc2ggcmVjb3ZlcnkuCgogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHVtb2QuYwo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwdW1vZC5jJwotLS0g
YS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzB1bW9kLmMJcmV2aWQ6dmFzaWwuZGltb3ZA
b3JhY2xlLmNvbS0yMDEwMDUzMTE2MzU0MC05ZnUzcHJibjJhc3F3ZGk1CisrKyBiL3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9yb3cvcm93MHVtb2QuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDEwMDYwMTEwMzczOC11cG04YXdhaGVzbWVoOWRyCkBAIC02NTcsMjQgKzY1Nyw1NSBAQCBy
b3dfdW5kb19tb2RfdXBkX2V4aXN0X3NlYygKIAkJCS8qIEJ1aWxkIHRoZSBuZXdlc3QgdmVyc2lv
biBvZiB0aGUgaW5kZXggZW50cnkgKi8KIAkJCWVudHJ5ID0gcm93X2J1aWxkX2luZGV4X2VudHJ5
KG5vZGUtPnJvdywgbm9kZS0+ZXh0LAogCQkJCQkJICAgICAgaW5kZXgsIGhlYXApOwotCQkJdXRf
YShlbnRyeSk7Ci0JCQkvKiBOT1RFIHRoYXQgaWYgd2UgdXBkYXRlZCB0aGUgZmllbGRzIG9mIGEK
LQkJCWRlbGV0ZS1tYXJrZWQgc2Vjb25kYXJ5IGluZGV4IHJlY29yZCBzbyB0aGF0Ci0JCQlhbHBo
YWJldGljYWxseSB0aGV5IHN0YXllZCB0aGUgc2FtZSwgZS5nLiwKLQkJCSdhYmMnIC0+ICdhQmMn
LCB3ZSBjYW5ub3QgcmV0dXJuIHRvIHRoZSBvcmlnaW5hbAotCQkJdmFsdWVzIGJlY2F1c2Ugd2Ug
ZG8gbm90IGtub3cgdGhlbS4gQnV0IHRoaXMgc2hvdWxkCi0JCQlub3QgY2F1c2UgcHJvYmxlbXMg
YmVjYXVzZSBpbiByb3cwc2VsLmMsIGluIHF1ZXJpZXMKLQkJCXdlIGFsd2F5cyByZXRyaWV2ZSB0
aGUgY2x1c3RlcmVkIGluZGV4IHJlY29yZCBvciBhbgotCQkJZWFybGllciB2ZXJzaW9uIG9mIGl0
LCBpZiB0aGUgc2Vjb25kYXJ5IGluZGV4IHJlY29yZAotCQkJdGhyb3VnaCB3aGljaCB3ZSBkbyB0
aGUgc2VhcmNoIGlzIGRlbGV0ZS1tYXJrZWQuICovCi0KLQkJCWVyciA9IHJvd191bmRvX21vZF9k
ZWxfbWFya19vcl9yZW1vdmVfc2VjKG5vZGUsIHRociwKLQkJCQkJCQkJICBpbmRleCwKLQkJCQkJ
CQkJICBlbnRyeSk7Ci0JCQlpZiAoZXJyICE9IERCX1NVQ0NFU1MpIHsKLQkJCQltZW1faGVhcF9m
cmVlKGhlYXApOworCQkJaWYgKFVOSVZfVU5MSUtFTFkoIWVudHJ5KSkgeworCQkJCS8qIFRoZSBz
ZXJ2ZXIgbXVzdCBoYXZlIGNyYXNoZWQgaW4KKwkJCQlyb3dfdXBkX2NsdXN0X3JlY19ieV9pbnNl
cnQoKSwgaW4KKwkJCQlyb3dfaW5zX2luZGV4X2VudHJ5X2xvdygpIGJlZm9yZQorCQkJCWJ0cl9z
dG9yZV9iaWdfcmVjX2V4dGVybl9maWVsZHMoKQorCQkJCWhhcyB3cml0dGVuIHRoZSBleHRlcm5h
bGx5IHN0b3JlZCBjb2x1bW5zCisJCQkJKEJMT0JzKSBvZiB0aGUgbmV3IGNsdXN0ZXJlZCBpbmRl
eCBlbnRyeS4gKi8KIAotCQkJCXJldHVybihlcnIpOworCQkJCS8qIFRoZSB0YWJsZSBtdXN0IGJl
IGluIERZTkFNSUMgb3IgQ09NUFJFU1NFRAorCQkJCWZvcm1hdC4gIFJFRFVOREFOVCBhbmQgQ09N
UEFDVCBmb3JtYXRzCisJCQkJc3RvcmUgYSBsb2NhbCA3NjgtYnl0ZSBwcmVmaXggb2YgZWFjaAor
CQkJCWV4dGVybmFsbHkgc3RvcmVkIGNvbHVtbi4gKi8KKwkJCQl1dF9hKGRpY3RfdGFibGVfZ2V0
X2Zvcm1hdChpbmRleC0+dGFibGUpCisJCQkJICAgICA+PSBESUNUX1RGX0ZPUk1BVF9aSVApOwor
CisJCQkJLyogVGhpcyBpcyBvbmx5IGxlZ2l0aW1hdGUgd2hlbgorCQkJCXJvbGxpbmcgYmFjayBh
biBpbmNvbXBsZXRlIHRyYW5zYWN0aW9uCisJCQkJYWZ0ZXIgY3Jhc2ggcmVjb3ZlcnkuICovCisJ
CQkJdXRfYSh0aHJfZ2V0X3RyeCh0aHIpLT5pc19yZWNvdmVyZWQpOworCisJCQkJLyogVGhlIHNl
cnZlciBtdXN0IGhhdmUgY3Jhc2hlZCBiZWZvcmUKKwkJCQljb21wbGV0aW5nIHRoZSBpbnNlcnQg
b2YgdGhlIG5ldworCQkJCWNsdXN0ZXJlZCBpbmRleCBlbnRyeSBhbmQgYmVmb3JlCisJCQkJaW5z
ZXJ0aW5nIHRvIHRoZSBzZWNvbmRhcnkgaW5kZXhlcy4KKwkJCQlCZWNhdXNlIG5vZGUtPnJvdyB3
YXMgbm90IHlldCB3cml0dGVuCisJCQkJdG8gdGhpcyBpbmRleCwgd2UgY2FuIGlnbm9yZSBpdC4g
IEJ1dAorCQkJCXdlIG11c3QgcmVzdG9yZSBub2RlLT51bmRvX3Jvdy4gKi8KKwkJCX0gZWxzZSB7
CisJCQkJLyogTk9URSB0aGF0IGlmIHdlIHVwZGF0ZWQgdGhlIGZpZWxkcyBvZiBhCisJCQkJZGVs
ZXRlLW1hcmtlZCBzZWNvbmRhcnkgaW5kZXggcmVjb3JkIHNvIHRoYXQKKwkJCQlhbHBoYWJldGlj
YWxseSB0aGV5IHN0YXllZCB0aGUgc2FtZSwgZS5nLiwKKwkJCQknYWJjJyAtPiAnYUJjJywgd2Ug
Y2Fubm90IHJldHVybiB0byB0aGUKKwkJCQlvcmlnaW5hbCB2YWx1ZXMgYmVjYXVzZSB3ZSBkbyBu
b3Qga25vdyB0aGVtLgorCQkJCUJ1dCB0aGlzIHNob3VsZCBub3QgY2F1c2UgcHJvYmxlbXMgYmVj
YXVzZQorCQkJCWluIHJvdzBzZWwuYywgaW4gcXVlcmllcyB3ZSBhbHdheXMgcmV0cmlldmUKKwkJ
CQl0aGUgY2x1c3RlcmVkIGluZGV4IHJlY29yZCBvciBhbiBlYXJsaWVyCisJCQkJdmVyc2lvbiBv
ZiBpdCwgaWYgdGhlIHNlY29uZGFyeSBpbmRleCByZWNvcmQKKwkJCQl0aHJvdWdoIHdoaWNoIHdl
IGRvIHRoZSBzZWFyY2ggaXMKKwkJCQlkZWxldGUtbWFya2VkLiAqLworCisJCQkJZXJyID0gcm93
X3VuZG9fbW9kX2RlbF9tYXJrX29yX3JlbW92ZV9zZWMoCisJCQkJCW5vZGUsIHRociwgaW5kZXgs
IGVudHJ5KTsKKwkJCQlpZiAoZXJyICE9IERCX1NVQ0NFU1MpIHsKKwkJCQkJbWVtX2hlYXBfZnJl
ZShoZWFwKTsKKworCQkJCQlyZXR1cm4oZXJyKTsKKwkJCQl9CisKKwkJCQltZW1faGVhcF9lbXB0
eShoZWFwKTsKIAkJCX0KIAogCQkJLyogV2UgbWF5IGhhdmUgdG8gdXBkYXRlIHRoZSBkZWxldGUg
bWFyayBpbiB0aGUKQEAgLTY4Myw3ICs3MTQsNiBAQCByb3dfdW5kb19tb2RfdXBkX2V4aXN0X3Nl
YygKIAkJCXRoZSBzZWNvbmRhcnkgaW5kZXggcmVjb3JkIGlmIHdlIHVwZGF0ZWQgaXRzIGZpZWxk
cwogCQkJYnV0IGFscGhhYmV0aWNhbGx5IHRoZXkgc3RheWVkIHRoZSBzYW1lLCBlLmcuLAogCQkJ
J2FiYycgLT4gJ2FCYycuICovCi0JCQltZW1faGVhcF9lbXB0eShoZWFwKTsKIAkJCWVudHJ5ID0g
cm93X2J1aWxkX2luZGV4X2VudHJ5KG5vZGUtPnVuZG9fcm93LAogCQkJCQkJICAgICAgbm9kZS0+
dW5kb19leHQsCiAJCQkJCQkgICAgICBpbmRleCwgaGVhcCk7Cgo=

--===============1357149181==
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: 92a8f4ab344b7fb9a9e070a165b7511544e8decc
# timestamp: 2010-06-01 13:37:52 +0300
# base_revision_id: vasil.dimov@stripped\
#   9fu3prbn2asqwdi5
# 
# Begin bundle
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
pwoSHbErhoA=


--===============1357149181==--