From: marko.makela
Date: February 9 2011 3:15pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3705) Bug#60049
List-Archive: http://lists.mysql.com/commits/130887
X-Bug: 60049
Message-Id: <201102091515.p19EDVHI022370@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0443884684=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIwODEwNTYyMy1xczhv
bDZ3emNqbGxkM3JtCgogMzcwNSBNYXJrbyBNw6RrZWzDpAkyMDExLTAyLTA5CiAgICAgIEJ1ZyM2
MDA0OSBVcGRhdGVzIGNhbiBsZWF2ZSBnYXJiYWdlIGluIHVuaXF1ZSBzZWNvbmRhcnkgaW5kZXhl
cwogICAgICAKICAgICAgVGhpcyBpcyBhIHByZWxpbWluYXJ5IHBhdGNoLiBUaGlzIHNob3VsZCBi
ZSBmaXhlZCBpbiB0aGUgSW5ub0RCIHBsdWdpbiB0b28uCiAgICAgIFRoZSBteXNxbC10ZXN0IHNj
cmlwdCBuZWVkcyBhIGJldHRlciB3YXkgb2YgZW5zdXJpbmcKICAgICAgdGhhdCB0aGUgc2h1dGRv
d24gd2FzIGNvbXBsZXRlZCBhbmQgdGhlIGRhdGEgZmlsZXMgd2VyZSBmbHVzaGVkLgogICAgICBB
bHNvIHRoZSBzZXJ2ZXIgcmVzdGFydCBhdCBlbmQgaXMgdW5uZWNlc3NhcnkuCgogICAgYWRkZWQ6
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzYwMDQ5LnJlc3VsdAog
ICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0OS1tYXN0ZXIub3B0
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QKICAg
IG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmMKPT09IGFkZGVk
IGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzYwMDQ5LnJlc3VsdCcK
LS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNjAwNDkucmVzdWx0CTE5
NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9p
bm5vZGJfYnVnNjAwNDkucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEw
MjA5MTUxNTIwLTJweHYzZ3pibWhyYTRjYnEKQEAgLTAsMCArMSw4IEBACitDUkVBVEUgVEFCTEUg
dChhIElOVClFTkdJTkU9SW5ub0RCOworUkVOQU1FIFRBQkxFIHQgVE8gdTsKK0RST1AgVEFCTEUg
dTsKK1NFTEVDVCBAQGlubm9kYl9mYXN0X3NodXRkb3duOworQEBpbm5vZGJfZmFzdF9zaHV0ZG93
bgorMAorTGFzdCByZWNvcmQgb2YgSURfSU5EIHJvb3QgcGFnZSAoOSk6CisxODA4MDAwMDE4MDUw
MDc0MDAwMDAwMDAwMDAwMDAwYzUzNTk1MzVmNDY0ZjUyNDU0OTQ3NGU1ZjQzNGY0YzUzCgo9PT0g
YWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDktbWFz
dGVyLm9wdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDkt
bWFzdGVyLm9wdAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3Vp
dGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LW1hc3Rlci5vcHQJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMTAyMDkxNTE1MjAtMnB4djNnemJtaHJhNGNicQpAQCAtMCwwICsxIEBA
CistLWlubm9kYl9mYXN0X3NodXRkb3duPTAKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCgo9
PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDku
dGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVnNjAwNDkudGVz
dAkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MTAyMDkxNTE1MjAtMnB4djNnemJtaHJhNGNicQpAQCAtMCwwICsxLDM3IEBACisjIEJ1ZyAjNjAw
NDkgVXBkYXRlcyBjYW4gbGVhdmUgZ2FyYmFnZSBpbiB1bmlxdWUgc2Vjb25kYXJ5IGluZGV4ZXMK
KyMgVGhpcyB0ZXN0IHJlcXVpcmVzIGEgZnJlc2ggc2VydmVyIHN0YXJ0LXVwLgorCistLSBzb3Vy
Y2UgaW5jbHVkZS9oYXZlX2lubm9kYi5pbmMKKworQ1JFQVRFIFRBQkxFIHQoYSBJTlQpRU5HSU5F
PUlubm9EQjsKK1JFTkFNRSBUQUJMRSB0IFRPIHU7CitEUk9QIFRBQkxFIHU7CitTRUxFQ1QgQEBp
bm5vZGJfZmFzdF9zaHV0ZG93bjsKK2xldCAkTVlTUUxEX0RBVEFESVI9YHNlbGVjdCBAQGRhdGFk
aXJgOworCisjIFNodXQgZG93biB0aGUgc2VydmVyCistLSBleGVjIGVjaG8gIndhaXQiID4gJE1Z
U1FMVEVTVF9WQVJESVIvdG1wL215c3FsZC4xLmV4cGVjdAorLS0gc2h1dGRvd25fc2VydmVyIDEw
CistLSBzb3VyY2UgaW5jbHVkZS93YWl0X3VudGlsX2Rpc2Nvbm5lY3RlZC5pbmMKKworIyBDaGVj
ayB0aGUgdGFpbCBvZiBJRF9JTkQgKFNZU19UQUJMRVMuSUQpCitsZXQgSUJEQVRBMT0kTVlTUUxE
X0RBVEFESVIvaWJkYXRhMTsKK3Blcmw7CitteSAkZmlsZSA9ICRFTlZ7J0lCREFUQTEnfTsKK29w
ZW4oRklMRSwgIjwkZmlsZSIpIHx8IGRpZSAiVW5hYmxlIHRvIG9wZW4gJGZpbGUiOworIyBSZWFk
IERJQ1RfSERSX1RBQkxFX0lEUywgdGhlIHJvb3QgcGFnZSBudW1iZXIgb2YgSURfSU5EIChTWVNf
VEFCTEVTLklEKS4KK3NlZWsoRklMRSwgNyoxNjM4NCszOCszNiwgMCkgfHwgZGllICJVbmFibGUg
dG8gc2VlayAkZmlsZSI7CitkaWUgdW5sZXNzIHJlYWQoRklMRSwgJF8sIDQpID09IDQ7CitteSAk
c3lzX3RhYmxlc19pZF9yb290ID0gdW5wYWNrICJOIjsKK3ByaW50ICJMYXN0IHJlY29yZCBvZiBJ
RF9JTkQgcm9vdCBwYWdlICgkc3lzX3RhYmxlc19pZF9yb290KTpcbiI7CisjIFRoaXMgc2hvdWxk
IGJlIHRoZSBsYXN0IHJlY29yZCBpbiBJRF9JTkQuIER1bXAgaXQgaW4gaGV4YWRlY2ltYWwuCitz
ZWVrKEZJTEUsICRzeXNfdGFibGVzX2lkX3Jvb3QqMTYzODQgKyAxNTIsIDApIHx8IGRpZSAiVW5h
YmxlIHRvIHNlZWsgJGZpbGUiOworcmVhZChGSUxFLCAkXywgMzIpIHx8IGRpZSAiVW5hYmxlIHRv
IHJlYWQgJGZpbGUiOworY2xvc2UoRklMRSk7CitwcmludCB1bnBhY2soIkgqIiksIlxuIjsKK0VP
RgorCisjIFJlc3RhcnQgdGhlIHNlcnZlci4KKy0tIGV4ZWMgZWNobyAicmVzdGFydCIgPiAkTVlT
UUxURVNUX1ZBUkRJUi90bXAvbXlzcWxkLjEuZXhwZWN0CistLSBlbmFibGVfcmVjb25uZWN0Cist
LSBzb3VyY2UgaW5jbHVkZS93YWl0X3VudGlsX2Nvbm5lY3RlZF9hZ2Fpbi5pbmMKCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmMnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2Uvcm93L3JvdzBpbnMuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEx
MDIwODEwNTYyMy1xczhvbDZ3emNqbGxkM3JtCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3Jv
dzBpbnMuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIwOTE1MTUyMC0ycHh2
M2d6Ym1ocmE0Y2JxCkBAIC0xOTE3LDEwICsxOTE3LDggQEAgdWxpbnQKIHJvd19pbnNfbXVzdF9t
b2RpZnkoCiAvKj09PT09PT09PT09PT09PT0qLwogCQkJCS8qIG91dDogMCBpZiBubyB1cGRhdGUs
IFJPV19JTlNfUFJFViBpZgotCQkJCXByZXZpb3VzIHNob3VsZCBiZSB1cGRhdGVkOyBjdXJyZW50
bHkgd2UKLQkJCQlkbyB0aGUgc2VhcmNoIHNvIHRoYXQgb25seSB0aGUgbG93X21hdGNoCi0JCQkJ
cmVjb3JkIGNhbiBtYXRjaCBlbm91Z2ggdG8gdGhlIHNlYXJjaCB0dXBsZSwKLQkJCQlub3QgdGhl
IG5leHQgcmVjb3JkICovCisJCQkJcHJldmlvdXMgc2hvdWxkIGJlIHVwZGF0ZWQsIFJPV19JTlNf
TkVYVAorCQkJCWlmIG5leHQgc2hvdWxkIGJlIHVwZGF0ZWQgKi8KIAlidHJfY3VyX3QqCWN1cnNv
cikJLyogaW46IEItdHJlZSBjdXJzb3IgKi8KIHsKIAl1bGludAllbm91Z2hfbWF0Y2g7CkBAIC0x
OTQ1LDYgKzE5NDMsMTYgQEAgcm93X2luc19tdXN0X21vZGlmeSgKIAkJfQogCX0KIAorCWlmIChj
dXJzb3ItPnVwX21hdGNoID49IGVub3VnaF9tYXRjaCkgeworCisJCXJlYyA9IHBhZ2VfcmVjX2dl
dF9uZXh0KGJ0cl9jdXJfZ2V0X3JlYyhjdXJzb3IpKTsKKworCQlpZiAoIXBhZ2VfcmVjX2lzX3N1
cHJlbXVtKHJlYykpIHsKKworCQkJcmV0dXJuKFJPV19JTlNfTkVYVCk7CisJCX0KKwl9CisKIAly
ZXR1cm4oMCk7CiB9CiAKCg==

--===============0443884684==
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: 45614994130e59547d9e700df1c135d5e9c365f7
# timestamp: 2011-02-09 17:15:33 +0200
# base_revision_id: marko.makela@stripped\
#   qs8ol6wzcjlld3rm
# 
# Begin bundle
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


--===============0443884684==--