From: marko.makela
Date: May 12 2010 5:39am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3460) Bug#53471
List-Archive: http://lists.mysql.com/commits/108064
X-Bug: 53471
Message-Id: <201005120539.o4C55mcS012051@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1953561881=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwtNS4xLWlubm9kYjIvIGJh
c2VkIG9uIHJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTExMTY1ODQ1LWxzdzdz
ZWl4ZnRnenBmcXQKCiAzNDYwIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTIKICAgICAgcm93X21l
cmdlX2Ryb3BfdGVtcF9pbmRleGVzKCk6IERvIG5vdCByZWZlcmVuY2UgZnJlZWQgbWVtb3J5Lgog
ICAgICAoQnVnICM1MzQ3MSkKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL3Jvdy9yb3cwbWVyZ2UuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL3Jvdy9yb3cwbWVyZ2UuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cw
bWVyZ2UuYwkyMDEwLTA1LTA1IDEyOjM5OjAxICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9yb3cvcm93MG1lcmdlLmMJMjAxMC0wNS0xMiAwNTozOToyNSArMDAwMApAQCAtMjA5Niw5
ICsyMDk2LDEyIEBAIHJvd19tZXJnZV9kcm9wX3RlbXBfaW5kZXhlcyh2b2lkKQogCiAJCWlmICh0
YWJsZSkgewogCQkJZGljdF9pbmRleF90KglpbmRleDsKKwkJCWRpY3RfaW5kZXhfdCoJbmV4dF9p
bmRleDsKIAogCQkJZm9yIChpbmRleCA9IGRpY3RfdGFibGVfZ2V0X2ZpcnN0X2luZGV4KHRhYmxl
KTsKLQkJCSAgICAgaW5kZXg7IGluZGV4ID0gZGljdF90YWJsZV9nZXRfbmV4dF9pbmRleChpbmRl
eCkpIHsKKwkJCSAgICAgaW5kZXg7IGluZGV4ID0gbmV4dF9pbmRleCkgeworCisJCQkJbmV4dF9p
bmRleCA9IGRpY3RfdGFibGVfZ2V0X25leHRfaW5kZXgoaW5kZXgpOwogCiAJCQkJaWYgKCppbmRl
eC0+bmFtZSA9PSBURU1QX0lOREVYX1BSRUZJWCkgewogCQkJCQlyb3dfbWVyZ2VfZHJvcF9pbmRl
eChpbmRleCwgdGFibGUsIHRyeCk7Cgo=

--===============1953561881==
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/mysql-5.1-innodb2/
# testament_sha1: d77f9f706bfa6775d3350b6bbad1e11577ab0889
# timestamp: 2010-05-12 08:39:35 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   lsw7seixftgzpfqt
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTGxKqIAAcDfgGAwW3P//1cC
AAC////4UAP5LS9YdXbaXTnCSSIzUxQ9BtFPIRp6jQNAaNHqAElINMSn6NBTQaeo9QAAGjIACSTQ
UxMU8gaSekbQ1MAmmmEDTQ5gAJgACYAAAAACSQmqeTaTTKPJPRNAekDQA0AC95MpJgzwxw+Nuv57
hvPrY48oqoZWNZsseKCPJg/yulu0LR343bDRnZmXn4r9Rndi5g0Z6oTj7nPlZw8f96YD+Wh4Sdjl
wizNvYWqmPJlugfrOmyNXQgdoyxAbS6LAmPsw9vqSO/TFzO3NCGZM8R8qfOsT1CWpYMJ2l0G1iVg
Kk5px/CKUmlBmsbnrSOka9xHzW/olRIrmKpOZgleKA1XFFhqPuk6dSzV6Is7Xd9FrBDzDswRantU
6Um49eFD+HpT2NRJeyfi8OOWl6x1iW9bctMDJIoJ1pGJnqbiVMhbB9FoxtThz6/ZKo7BXaqjPXAn
WPpW0VCZSKpaTSTUW3sgF0uOcnK1jKFY021EsM7q4lqsFPAzBQMlmeaYGeYTjKQ1q0rIqdO4hlWn
j76Sw0D3lbwwU5oWEw9ULOwxgtcWyU24npw8JFHVmtfS1xRVlVLCotKDkBUzSnepSNRFxbcy946b
DUNcVHk5OsrnYmNaneWhOnbW8O2DP3k2F6MZF1/RrHqI8Gj3MQbk6ju4PKBNnfQX5JD3smP39sHm
lDNNX2KEEYQDe8bex722NmiGlbDI4JHxSmSRdnHB5JHhxkkaog8XnKJbL1puU0ssO423IYeiAxLe
vBdq47k0CXV0m8fLsgYuyQ1yRzQNxgx1FE6aIvJ6fGg7VIbDhNYfmS+v4TgVR0eBO5jWRnH1bB5V
aUPpTBjVFiWsqG51tBSpgfyZHJXCuIT3BlOrUYTU4WAWINAWKePCSYgQNZuIHDUtZiUvPXfyGUKY
lBNaKC27OqtdAzA/n4ayu5VXtrBqGM4Ypyaq0qFMOLsAeXZwi5jub7YlfDQ+NgFJvAcfAoY6bjPh
akd1IVgqpuE6ckWTJDSsP1VLVySdaR2pHJq3Meo5NlU5Z0rRiupLKM72nPQWjfLIBQW7n5FjQsfv
XP3zRw0P4Y8NIQZDJ1Jj+OTkhtgp8NQKcDmeC+UjqCtOm32D4SE5KBy1FMjLLJQaNC1TCji5w1vr
KxUX3qSS1KbCyaIpdEKmT5kRiCoV/mKGy0P1GPLkKGKHA5ViZ4zWm1YQYkaAGisl8VFHSrM/ZVPz
nM5PqHNOBCnFURe7IrxVvKRKgzhexFljAs2etcc1FZqwAtBb5rB+8UkFy5/R0vi3SwzZZ2yqNsVw
9yzV/4u5IpwoSBjYlVEA


--===============1953561881==--