From: marko.makela
Date: June 1 2010 11:19am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3487 to 3488) Bug#53812
List-Archive: http://lists.mysql.com/commits/109788
X-Bug: 53812
Message-Id: <201006011119.o51BJYOn004729@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1597962772=="

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

IDM0ODggTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wMQogICAgICBCdWcjNTM4MTI6IGFzc2VydCBy
b3cvcm93MHVtb2QuYyBsaW5lIDY2MCBpbiB0eG4gcm9sbGJhY2sgYWZ0ZXIgY3Jhc2ggcmVjb3Zl
cnkKICAgICAgCiAgICAgIHJvd191bmRvX21vZF91cGRfZXhpc3Rfc2VjKCk6IFRvbGVyYXRlIGEg
ZmFpbHVyZSB0byBidWlsZCB0aGUgaW5kZXggZW50cnkKICAgICAgZm9yIGEgRFlOQU1JQyBvciBD
T01QUkVTU0VEIHRhYmxlIGR1cmluZyBjcmFzaCByZWNvdmVyeS4KCiAgICBtb2RpZmllZDoKICAg
ICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwdW1vZC5jCiAzNDg3IFZhc2lsIERpbW92
CTIwMTAtMDUtMzEKICAgICAgTWVyZ2UgYSBjaGFuZ2UgZnJvbSBteXNxbC10cnVuay1pbm5vZGI6
CiAgICAgIAogICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgIHJldm5vOiAzMTI3CiAgICAgICAgcmV2aXNpb24t
aWQ6IHZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDA1MzExNTIzNDEteDJkNGhtYTY0NGljYW1o
MQogICAgICAgIHBhcmVudDogdmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDUzMTEwNTkyMy1r
cGp3bDRyYmdmcGZqMTNjCiAgICAgICAgY29tbWl0dGVyOiBWYXNpbCBEaW1vdiA8dmFzaWwuZGlt
b3ZAb3JhY2xlLmNvbT4KICAgICAgICBicmFuY2ggbmljazogbXlzcWwtdHJ1bmstaW5ub2RiCiAg
ICAgICAgdGltZXN0YW1wOiBNb24gMjAxMC0wNS0zMSAxODoyMzo0MSArMDMwMAogICAgICAgIG1l
c3NhZ2U6CiAgICAgICAgICBGaXggQnVnICM1Mzk0NyBJbm5vREI6IEFzc2VydGlvbiBmYWlsdXJl
IGluIHRocmVhZCA0MjI0IGluIGZpbGUgLlxzeW5jXHN5bmMwc3luYy5jIGxpbmUgMzI0CiAgICAg
ICAgICAKICAgICAgICAgIERlc3Ryb3kgdGhlIHJ3LWxvY2sgb2JqZWN0IGJlZm9yZSBmcmVlaW5n
IHRoZSBtZW1vcnkgaXQgaXMgb2NjdXB5aW5nLgogICAgICAgICAgSWYgd2UgZG8gbm90IGRvIHRo
aXMsIHRoZW4gdGhlIG11dGV4IHRoYXQgaXMgY29udGFpbmVkIGluIHRoZSBydy1sb2NrCiAgICAg
ICAgICBvYmplY3QgYnRyX3NlYXJjaF9sYXRjaF90ZW1wLT5tdXRleCBnZXRzICJmcmVlZCIgYW5k
IHN1YnNlcXVlbnRseQogICAgICAgICAgbXV0ZXhfZnJlZSgpIGZyb20gc3luY19jbG9zZSgpIGhp
dHMgYSBtdXRleCB3aG9zZSBtZW1vcnkgaGFzIGJlZW4KICAgICAgICAgIGZyZWVkIGFuZCBjcmFz
aGVzLgogICAgICAgICAgCiAgICAgICAgICBBcHByb3ZlZCBieToJSGVpa2tpICh2aWEgSVJDKQog
ICAgICAgICAgRGlzY3Vzc2VkIHdpdGg6CUNhbHZpbgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9y
YWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBzZWEuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwdW1vZC5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVn
aW4vcm93L3JvdzB1bW9kLmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDUzMTE2
MzU0MC05ZnUzcHJibjJhc3F3ZGk1CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93
MHVtb2QuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTEwMzczOC11cG04
YXdhaGVzbWVoOWRyCkBAIC02NTcsMjQgKzY1Nyw1NSBAQCByb3dfdW5kb19tb2RfdXBkX2V4aXN0
X3NlYygKIAkJCS8qIEJ1aWxkIHRoZSBuZXdlc3QgdmVyc2lvbiBvZiB0aGUgaW5kZXggZW50cnkg
Ki8KIAkJCWVudHJ5ID0gcm93X2J1aWxkX2luZGV4X2VudHJ5KG5vZGUtPnJvdywgbm9kZS0+ZXh0
LAogCQkJCQkJICAgICAgaW5kZXgsIGhlYXApOwotCQkJdXRfYShlbnRyeSk7Ci0JCQkvKiBOT1RF
IHRoYXQgaWYgd2UgdXBkYXRlZCB0aGUgZmllbGRzIG9mIGEKLQkJCWRlbGV0ZS1tYXJrZWQgc2Vj
b25kYXJ5IGluZGV4IHJlY29yZCBzbyB0aGF0Ci0JCQlhbHBoYWJldGljYWxseSB0aGV5IHN0YXll
ZCB0aGUgc2FtZSwgZS5nLiwKLQkJCSdhYmMnIC0+ICdhQmMnLCB3ZSBjYW5ub3QgcmV0dXJuIHRv
IHRoZSBvcmlnaW5hbAotCQkJdmFsdWVzIGJlY2F1c2Ugd2UgZG8gbm90IGtub3cgdGhlbS4gQnV0
IHRoaXMgc2hvdWxkCi0JCQlub3QgY2F1c2UgcHJvYmxlbXMgYmVjYXVzZSBpbiByb3cwc2VsLmMs
IGluIHF1ZXJpZXMKLQkJCXdlIGFsd2F5cyByZXRyaWV2ZSB0aGUgY2x1c3RlcmVkIGluZGV4IHJl
Y29yZCBvciBhbgotCQkJZWFybGllciB2ZXJzaW9uIG9mIGl0LCBpZiB0aGUgc2Vjb25kYXJ5IGlu
ZGV4IHJlY29yZAotCQkJdGhyb3VnaCB3aGljaCB3ZSBkbyB0aGUgc2VhcmNoIGlzIGRlbGV0ZS1t
YXJrZWQuICovCi0KLQkJCWVyciA9IHJvd191bmRvX21vZF9kZWxfbWFya19vcl9yZW1vdmVfc2Vj
KG5vZGUsIHRociwKLQkJCQkJCQkJICBpbmRleCwKLQkJCQkJCQkJICBlbnRyeSk7Ci0JCQlpZiAo
ZXJyICE9IERCX1NVQ0NFU1MpIHsKLQkJCQltZW1faGVhcF9mcmVlKGhlYXApOworCQkJaWYgKFVO
SVZfVU5MSUtFTFkoIWVudHJ5KSkgeworCQkJCS8qIFRoZSBzZXJ2ZXIgbXVzdCBoYXZlIGNyYXNo
ZWQgaW4KKwkJCQlyb3dfdXBkX2NsdXN0X3JlY19ieV9pbnNlcnQoKSwgaW4KKwkJCQlyb3dfaW5z
X2luZGV4X2VudHJ5X2xvdygpIGJlZm9yZQorCQkJCWJ0cl9zdG9yZV9iaWdfcmVjX2V4dGVybl9m
aWVsZHMoKQorCQkJCWhhcyB3cml0dGVuIHRoZSBleHRlcm5hbGx5IHN0b3JlZCBjb2x1bW5zCisJ
CQkJKEJMT0JzKSBvZiB0aGUgbmV3IGNsdXN0ZXJlZCBpbmRleCBlbnRyeS4gKi8KIAotCQkJCXJl
dHVybihlcnIpOworCQkJCS8qIFRoZSB0YWJsZSBtdXN0IGJlIGluIERZTkFNSUMgb3IgQ09NUFJF
U1NFRAorCQkJCWZvcm1hdC4gIFJFRFVOREFOVCBhbmQgQ09NUEFDVCBmb3JtYXRzCisJCQkJc3Rv
cmUgYSBsb2NhbCA3NjgtYnl0ZSBwcmVmaXggb2YgZWFjaAorCQkJCWV4dGVybmFsbHkgc3RvcmVk
IGNvbHVtbi4gKi8KKwkJCQl1dF9hKGRpY3RfdGFibGVfZ2V0X2Zvcm1hdChpbmRleC0+dGFibGUp
CisJCQkJICAgICA+PSBESUNUX1RGX0ZPUk1BVF9aSVApOworCisJCQkJLyogVGhpcyBpcyBvbmx5
IGxlZ2l0aW1hdGUgd2hlbgorCQkJCXJvbGxpbmcgYmFjayBhbiBpbmNvbXBsZXRlIHRyYW5zYWN0
aW9uCisJCQkJYWZ0ZXIgY3Jhc2ggcmVjb3ZlcnkuICovCisJCQkJdXRfYSh0aHJfZ2V0X3RyeCh0
aHIpLT5pc19yZWNvdmVyZWQpOworCisJCQkJLyogVGhlIHNlcnZlciBtdXN0IGhhdmUgY3Jhc2hl
ZCBiZWZvcmUKKwkJCQljb21wbGV0aW5nIHRoZSBpbnNlcnQgb2YgdGhlIG5ldworCQkJCWNsdXN0
ZXJlZCBpbmRleCBlbnRyeSBhbmQgYmVmb3JlCisJCQkJaW5zZXJ0aW5nIHRvIHRoZSBzZWNvbmRh
cnkgaW5kZXhlcy4KKwkJCQlCZWNhdXNlIG5vZGUtPnJvdyB3YXMgbm90IHlldCB3cml0dGVuCisJ
CQkJdG8gdGhpcyBpbmRleCwgd2UgY2FuIGlnbm9yZSBpdC4gIEJ1dAorCQkJCXdlIG11c3QgcmVz
dG9yZSBub2RlLT51bmRvX3Jvdy4gKi8KKwkJCX0gZWxzZSB7CisJCQkJLyogTk9URSB0aGF0IGlm
IHdlIHVwZGF0ZWQgdGhlIGZpZWxkcyBvZiBhCisJCQkJZGVsZXRlLW1hcmtlZCBzZWNvbmRhcnkg
aW5kZXggcmVjb3JkIHNvIHRoYXQKKwkJCQlhbHBoYWJldGljYWxseSB0aGV5IHN0YXllZCB0aGUg
c2FtZSwgZS5nLiwKKwkJCQknYWJjJyAtPiAnYUJjJywgd2UgY2Fubm90IHJldHVybiB0byB0aGUK
KwkJCQlvcmlnaW5hbCB2YWx1ZXMgYmVjYXVzZSB3ZSBkbyBub3Qga25vdyB0aGVtLgorCQkJCUJ1
dCB0aGlzIHNob3VsZCBub3QgY2F1c2UgcHJvYmxlbXMgYmVjYXVzZQorCQkJCWluIHJvdzBzZWwu
YywgaW4gcXVlcmllcyB3ZSBhbHdheXMgcmV0cmlldmUKKwkJCQl0aGUgY2x1c3RlcmVkIGluZGV4
IHJlY29yZCBvciBhbiBlYXJsaWVyCisJCQkJdmVyc2lvbiBvZiBpdCwgaWYgdGhlIHNlY29uZGFy
eSBpbmRleCByZWNvcmQKKwkJCQl0aHJvdWdoIHdoaWNoIHdlIGRvIHRoZSBzZWFyY2ggaXMKKwkJ
CQlkZWxldGUtbWFya2VkLiAqLworCisJCQkJZXJyID0gcm93X3VuZG9fbW9kX2RlbF9tYXJrX29y
X3JlbW92ZV9zZWMoCisJCQkJCW5vZGUsIHRociwgaW5kZXgsIGVudHJ5KTsKKwkJCQlpZiAoZXJy
ICE9IERCX1NVQ0NFU1MpIHsKKwkJCQkJbWVtX2hlYXBfZnJlZShoZWFwKTsKKworCQkJCQlyZXR1
cm4oZXJyKTsKKwkJCQl9CisKKwkJCQltZW1faGVhcF9lbXB0eShoZWFwKTsKIAkJCX0KIAogCQkJ
LyogV2UgbWF5IGhhdmUgdG8gdXBkYXRlIHRoZSBkZWxldGUgbWFyayBpbiB0aGUKQEAgLTY4Myw3
ICs3MTQsNiBAQCByb3dfdW5kb19tb2RfdXBkX2V4aXN0X3NlYygKIAkJCXRoZSBzZWNvbmRhcnkg
aW5kZXggcmVjb3JkIGlmIHdlIHVwZGF0ZWQgaXRzIGZpZWxkcwogCQkJYnV0IGFscGhhYmV0aWNh
bGx5IHRoZXkgc3RheWVkIHRoZSBzYW1lLCBlLmcuLAogCQkJJ2FiYycgLT4gJ2FCYycuICovCi0J
CQltZW1faGVhcF9lbXB0eShoZWFwKTsKIAkJCWVudHJ5ID0gcm93X2J1aWxkX2luZGV4X2VudHJ5
KG5vZGUtPnVuZG9fcm93LAogCQkJCQkJICAgICAgbm9kZS0+dW5kb19leHQsCiAJCQkJCQkgICAg
ICBpbmRleCwgaGVhcCk7Cgo=

--===============1597962772==
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 14:19:21 +0300
# base_revision_id: vasil.dimov@stripped\
#   9fu3prbn2asqwdi5
# 
# Begin bundle
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
pwoSHbErhoA=


--===============1597962772==--