From: marko.makela
Date: November 3 2010 8:40am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3652)
List-Archive: http://lists.mysql.com/commits/122606
Message-Id: <201011030841.oA37O8Yq017987@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1475073026=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpzdW5ueS5iYWluc0BvcmFjbGUuY29tLTIwMTAxMTAzMDE0MDUzLXJsZ2hi
M3oxd2ZiYzQ1YWwKCiAzNjUyIE1hcmtvIE3DpGtlbMOkCTIwMTAtMTEtMDMKICAgICAgSW1wcm92
ZSB0aGUgZGlhZ25vc3RpY3Mgb2YgYnVmZmVyIHBvb2wgYWNjZXNzZXMgZm9yIEItdHJlZXMsCiAg
ICAgIHNvIHRoYXQgdGhlIGZpbGUgbmFtZXMgYW5kIGxpbmUgbnVtYmVycyBvZiB0aGUgcmVhbCBj
YWxscyBhcmUgc2hvd24KICAgICAgaW5zdGVhZCBvZiB0aGUgbGluZSBvZiB0aGUgYnVmX3BhZ2Vf
Z2V0KCkgY2FsbCBpbiBidHJfYmxvY2tfZ2V0KCkuCiAgICAgIAogICAgICBidHJfcGFnZV9nZXQo
KTogUmVwbGFjZWQgd2l0aCBhIG1hY3JvLgogICAgICAKICAgICAgYnRyX2Jsb2NrX2dldF9mdW5j
KCk6IFJlbmFtZWQgZnJvbSBidHJfYmxvY2tfZ2V0KCkuIEFkZCBmaWxlLCBsaW5lLgogICAgICAK
ICAgICAgYnRyX2Jsb2NrX2dldCgpOiBBIG1hY3JvIHRoYXQgcGFzc2VzIHRoZSBfX0ZJTEVfXywg
X19MSU5FX18gdG8KICAgICAgYnRyX2Jsb2NrX2dldF9mdW5jKCkuCgogICAgbW9kaWZpZWQ6CiAg
ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J0cjBidHIuaAogICAgICBzdG9yYWdl
L2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idHIwYnRyLmljCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idHIwYnRyLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9pbmNsdWRlL2J0cjBidHIuaAlyZXZpZDpzdW5ueS5iYWluc0BvcmFjbGUuY29tLTIw
MTAxMTAzMDE0MDUzLXJsZ2hiM3oxd2ZiYzQ1YWwKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L2luY2x1ZGUvYnRyMGJ0ci5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTAz
MDgzOTU5LXA5dzh3azZuMWxpdXJhcWYKQEAgLTk0LDI2ICs5NCw1MCBAQCBidHJfcm9vdF9nZXQo
CiBHZXRzIGEgYnVmZmVyIHBhZ2UgYW5kIGRlY2xhcmVzIGl0cyBsYXRjaGluZyBvcmRlciBsZXZl
bC4gKi8KIFVOSVZfSU5MSU5FCiBidWZfYmxvY2tfdCoKLWJ0cl9ibG9ja19nZXQoCi0vKj09PT09
PT09PT0qLwotCXVsaW50CXNwYWNlLAkJLyohPCBpbjogc3BhY2UgaWQgKi8KLQl1bGludAl6aXBf
c2l6ZSwJLyohPCBpbjogY29tcHJlc3NlZCBwYWdlIHNpemUgaW4gYnl0ZXMKLQkJCQlvciAwIGZv
ciB1bmNvbXByZXNzZWQgcGFnZXMgKi8KLQl1bGludAlwYWdlX25vLAkvKiE8IGluOiBwYWdlIG51
bWJlciAqLwotCXVsaW50CW1vZGUsCQkvKiE8IGluOiBsYXRjaCBtb2RlICovCi0JbXRyX3QqCW10
cik7CQkvKiE8IGluOiBtdHIgKi8KK2J0cl9ibG9ja19nZXRfZnVuYygKKy8qPT09PT09PT09PT09
PT09Ki8KKwl1bGludAkJc3BhY2UsCQkvKiE8IGluOiBzcGFjZSBpZCAqLworCXVsaW50CQl6aXBf
c2l6ZSwJLyohPCBpbjogY29tcHJlc3NlZCBwYWdlIHNpemUgaW4gYnl0ZXMKKwkJCQkJb3IgMCBm
b3IgdW5jb21wcmVzc2VkIHBhZ2VzICovCisJdWxpbnQJCXBhZ2Vfbm8sCS8qITwgaW46IHBhZ2Ug
bnVtYmVyICovCisJdWxpbnQJCW1vZGUsCQkvKiE8IGluOiBsYXRjaCBtb2RlICovCisJY29uc3Qg
Y2hhcioJZmlsZSwJCS8qITwgaW46IGZpbGUgbmFtZSAqLworCXVsaW50CQlsaW5lLAkJLyohPCBp
bjogbGluZSB3aGVyZSBjYWxsZWQgKi8KKwltdHJfdCoJCW10cikJCS8qITwgaW4vb3V0OiBtdHIg
Ki8KKwlfX2F0dHJpYnV0ZV9fKChub25udWxsKSk7CisvKiogR2V0cyBhIGJ1ZmZlciBwYWdlIGFu
ZCBkZWNsYXJlcyBpdHMgbGF0Y2hpbmcgb3JkZXIgbGV2ZWwuCitAcGFyYW0gc3BhY2UJdGFibGVz
cGFjZSBpZGVudGlmaWVyCitAcGFyYW0gemlwX3NpemUJY29tcHJlc3NlZCBwYWdlIHNpemUgaW4g
Ynl0ZXMgb3IgMCBmb3IgdW5jb21wcmVzc2VkIHBhZ2VzCitAcGFyYW0gcGFnZV9ubwlwYWdlIG51
bWJlcgorQHBhcmFtIG1vZGUJbGF0Y2ggbW9kZQorQHBhcmFtIG10cgltaW5pLXRyYW5zYWN0aW9u
IGhhbmRsZQorQHJldHVybiB0aGUgYmxvY2sgZGVzY3JpcHRvciAqLworIyBkZWZpbmUgYnRyX2Js
b2NrX2dldChzcGFjZSx6aXBfc2l6ZSxwYWdlX25vLG1vZGUsbXRyKSBcCisJYnRyX2Jsb2NrX2dl
dF9mdW5jKHNwYWNlLHppcF9zaXplLHBhZ2Vfbm8sbW9kZSxfX0ZJTEVfXyxfX0xJTkVfXyxtdHIp
CiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKiovLyoqCiBHZXRzIGEgYnVmZmVyIHBhZ2UgYW5kIGRlY2xhcmVzIGl0cyBsYXRjaGlu
ZyBvcmRlciBsZXZlbC4gKi8KIFVOSVZfSU5MSU5FCiBwYWdlX3QqCi1idHJfcGFnZV9nZXQoCi0v
Kj09PT09PT09PSovCi0JdWxpbnQJc3BhY2UsCQkvKiE8IGluOiBzcGFjZSBpZCAqLwotCXVsaW50
CXppcF9zaXplLAkvKiE8IGluOiBjb21wcmVzc2VkIHBhZ2Ugc2l6ZSBpbiBieXRlcwotCQkJCW9y
IDAgZm9yIHVuY29tcHJlc3NlZCBwYWdlcyAqLwotCXVsaW50CXBhZ2Vfbm8sCS8qITwgaW46IHBh
Z2UgbnVtYmVyICovCi0JdWxpbnQJbW9kZSwJCS8qITwgaW46IGxhdGNoIG1vZGUgKi8KLQltdHJf
dCoJbXRyKTsJCS8qITwgaW46IG10ciAqLworYnRyX3BhZ2VfZ2V0X2Z1bmMoCisvKj09PT09PT09
PT09PT09Ki8KKwl1bGludAkJc3BhY2UsCQkvKiE8IGluOiBzcGFjZSBpZCAqLworCXVsaW50CQl6
aXBfc2l6ZSwJLyohPCBpbjogY29tcHJlc3NlZCBwYWdlIHNpemUgaW4gYnl0ZXMKKwkJCQkJb3Ig
MCBmb3IgdW5jb21wcmVzc2VkIHBhZ2VzICovCisJdWxpbnQJCXBhZ2Vfbm8sCS8qITwgaW46IHBh
Z2UgbnVtYmVyICovCisJdWxpbnQJCW1vZGUsCQkvKiE8IGluOiBsYXRjaCBtb2RlICovCisJY29u
c3QgY2hhcioJZmlsZSwJCS8qITwgaW46IGZpbGUgbmFtZSAqLworCXVsaW50CQlsaW5lLAkJLyoh
PCBpbjogbGluZSB3aGVyZSBjYWxsZWQgKi8KKwltdHJfdCoJCW10cikJCS8qITwgaW4vb3V0OiBt
dHIgKi8KKwlfX2F0dHJpYnV0ZV9fKChub25udWxsKSk7CisvKiogR2V0cyBhIGJ1ZmZlciBwYWdl
IGFuZCBkZWNsYXJlcyBpdHMgbGF0Y2hpbmcgb3JkZXIgbGV2ZWwuCitAcGFyYW0gc3BhY2UJdGFi
bGVzcGFjZSBpZGVudGlmaWVyCitAcGFyYW0gemlwX3NpemUJY29tcHJlc3NlZCBwYWdlIHNpemUg
aW4gYnl0ZXMgb3IgMCBmb3IgdW5jb21wcmVzc2VkIHBhZ2VzCitAcGFyYW0gcGFnZV9ubwlwYWdl
IG51bWJlcgorQHBhcmFtIG1vZGUJbGF0Y2ggbW9kZQorQHBhcmFtIG10cgltaW5pLXRyYW5zYWN0
aW9uIGhhbmRsZQorQHJldHVybiB0aGUgdW5jb21wcmVzc2VkIHBhZ2UgZnJhbWUgKi8KKyMgZGVm
aW5lIGJ0cl9wYWdlX2dldChzcGFjZSx6aXBfc2l6ZSxwYWdlX25vLG1vZGUsbXRyKSBcCisJYnVm
X2Jsb2NrX2dldF9mcmFtZShidHJfYmxvY2tfZ2V0KHNwYWNlLHppcF9zaXplLHBhZ2Vfbm8sbW9k
ZSxtdHIpKQogI2VuZGlmIC8qICFVTklWX0hPVEJBQ0tVUCAqLwogLyoqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogR2V0cyB0
aGUgaW5kZXggaWQgZmllbGQgb2YgYSBwYWdlLgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J0cjBidHIuaWMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9pbmNsdWRlL2J0cjBidHIuaWMJcmV2aWQ6c3VubnkuYmFpbnNAb3JhY2xlLmNvbS0yMDEw
MTEwMzAxNDA1My1ybGdoYjN6MXdmYmM0NWFsCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9p
bmNsdWRlL2J0cjBidHIuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDExMDMw
ODM5NTktcDl3OHdrNm4xbGl1cmFxZgpAQCAtMzksMTggKzM5LDIxIEBAIENyZWF0ZWQgNi8yLzE5
OTQgSGVpa2tpIFR1dXJpCiBHZXRzIGEgYnVmZmVyIHBhZ2UgYW5kIGRlY2xhcmVzIGl0cyBsYXRj
aGluZyBvcmRlciBsZXZlbC4gKi8KIFVOSVZfSU5MSU5FCiBidWZfYmxvY2tfdCoKLWJ0cl9ibG9j
a19nZXQoCi0vKj09PT09PT09PT0qLwotCXVsaW50CXNwYWNlLAkJLyohPCBpbjogc3BhY2UgaWQg
Ki8KLQl1bGludAl6aXBfc2l6ZSwJLyohPCBpbjogY29tcHJlc3NlZCBwYWdlIHNpemUgaW4gYnl0
ZXMKLQkJCQlvciAwIGZvciB1bmNvbXByZXNzZWQgcGFnZXMgKi8KLQl1bGludAlwYWdlX25vLAkv
KiE8IGluOiBwYWdlIG51bWJlciAqLwotCXVsaW50CW1vZGUsCQkvKiE8IGluOiBsYXRjaCBtb2Rl
ICovCi0JbXRyX3QqCW10cikJCS8qITwgaW46IG10ciAqLworYnRyX2Jsb2NrX2dldF9mdW5jKAor
Lyo9PT09PT09PT09PT09PT0qLworCXVsaW50CQlzcGFjZSwJCS8qITwgaW46IHNwYWNlIGlkICov
CisJdWxpbnQJCXppcF9zaXplLAkvKiE8IGluOiBjb21wcmVzc2VkIHBhZ2Ugc2l6ZSBpbiBieXRl
cworCQkJCQlvciAwIGZvciB1bmNvbXByZXNzZWQgcGFnZXMgKi8KKwl1bGludAkJcGFnZV9ubywJ
LyohPCBpbjogcGFnZSBudW1iZXIgKi8KKwl1bGludAkJbW9kZSwJCS8qITwgaW46IGxhdGNoIG1v
ZGUgKi8KKwljb25zdCBjaGFyKglmaWxlLAkJLyohPCBpbjogZmlsZSBuYW1lICovCisJdWxpbnQJ
CWxpbmUsCQkvKiE8IGluOiBsaW5lIHdoZXJlIGNhbGxlZCAqLworCW10cl90KgkJbXRyKQkJLyoh
PCBpbi9vdXQ6IG10ciAqLwogewogCWJ1Zl9ibG9ja190KglibG9jazsKIAotCWJsb2NrID0gYnVm
X3BhZ2VfZ2V0KHNwYWNlLCB6aXBfc2l6ZSwgcGFnZV9ubywgbW9kZSwgbXRyKTsKKwlibG9jayA9
IGJ1Zl9wYWdlX2dldF9nZW4oc3BhY2UsIHppcF9zaXplLCBwYWdlX25vLCBtb2RlLAorCQkJCSBO
VUxMLCBCVUZfR0VULCBmaWxlLCBsaW5lLCBtdHIpOwogCiAJaWYgKG1vZGUgIT0gUldfTk9fTEFU
Q0gpIHsKIApAQCAtNjEsMjMgKzY0LDYgQEAgYnRyX2Jsb2NrX2dldCgKIH0KIAogLyoqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8q
KgotR2V0cyBhIGJ1ZmZlciBwYWdlIGFuZCBkZWNsYXJlcyBpdHMgbGF0Y2hpbmcgb3JkZXIgbGV2
ZWwuICovCi1VTklWX0lOTElORQotcGFnZV90KgotYnRyX3BhZ2VfZ2V0KAotLyo9PT09PT09PT0q
LwotCXVsaW50CXNwYWNlLAkJLyohPCBpbjogc3BhY2UgaWQgKi8KLQl1bGludAl6aXBfc2l6ZSwJ
LyohPCBpbjogY29tcHJlc3NlZCBwYWdlIHNpemUgaW4gYnl0ZXMKLQkJCQlvciAwIGZvciB1bmNv
bXByZXNzZWQgcGFnZXMgKi8KLQl1bGludAlwYWdlX25vLAkvKiE8IGluOiBwYWdlIG51bWJlciAq
LwotCXVsaW50CW1vZGUsCQkvKiE8IGluOiBsYXRjaCBtb2RlICovCi0JbXRyX3QqCW10cikJCS8q
ITwgaW46IG10ciAqLwotewotCXJldHVybihidWZfYmxvY2tfZ2V0X2ZyYW1lKGJ0cl9ibG9ja19n
ZXQoc3BhY2UsIHppcF9zaXplLCBwYWdlX25vLAotCQkJCQkJIG1vZGUsIG10cikpKTsKLX0KLQot
LyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqLy8qKgogU2V0cyB0aGUgaW5kZXggaWQgZmllbGQgb2YgYSBwYWdlLiAqLwogVU5JVl9J
TkxJTkUKIHZvaWQKCg==

--===============1475073026==
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: 0748b3c78e71a40130b28f07651977f5c9ca082b
# timestamp: 2010-11-03 10:40:11 +0200
# base_revision_id: sunny.bains@stripped\
#   rlghb3z1wfbc45al
# 
# Begin bundle
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
I4/xdyRThQkJ9dxvYA==


--===============1475073026==--