From: marko.makela
Date: June 14 2010 6:35am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3099) Bug#38999
List-Archive: http://lists.mysql.com/commits/110963
X-Bug: 38999
Message-Id: <201006140635.o5E64ZZK027117@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1075918717=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwODEyMjY0NS1wc25y
Y2xnN2o3bjF5bnZzCgogMzA5OSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTE0CiAgICAgIE1lcmdl
IGEgY2hhbmdlIGZyb20gbXlzcWwtNS4xLWlubm9kYjoKICAgICAgLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgIHJldm5vOiAz
NTA2CiAgICAgIHJldmlzaW9uLWlkOiBzZXJnZXkuZ2x1a2hvdkBzdW4uY29tLTIwMTAwNjA5MTIx
NzE4LTA0bXBrNWtqeHZucnhkdTgKICAgICAgcGFyZW50OiBzZXJnZXkuZ2x1a2hvdkBzdW4uY29t
LTIwMTAwNjA5MTIwNzM0LW5keTIyODF3YXU5MDY3enYKICAgICAgY29tbWl0dGVyOiBTZXJnZXkg
R2x1a2hvdiA8U2VyZ2V5LkdsdWtob3ZAc3VuLmNvbT4KICAgICAgYnJhbmNoIG5pY2s6IG15c3Fs
LTUuMS1pbm5vZGIKICAgICAgdGltZXN0YW1wOiBXZWQgMjAxMC0wNi0wOSAxNjoxNzoxOCArMDQw
MAogICAgICBtZXNzYWdlOgogICAgICAgIEJ1ZyMzODk5OSB2YWxncmluZCB3YXJuaW5ncyBmb3Ig
dXBkYXRlIHN0YXRlbWVudCBpbiBmdW5jdGlvbiBjb21wYXJlX3JlY29yZCgpCiAgICAgICAgKElu
bm9EQiBwbHVnaW4gYnJhbmNoKQogICAgICAKICAgICAgIEAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGJfcGx1Z2luL3IvaW5ub2RiX215c3FsLnJlc3VsdAogICAgICAgICAgdGVzdCBjYXNlCiAgICAg
IAogICAgICAgQCBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfbXlzcWwu
dGVzdAogICAgICAgICAgdGVzdCBjYXNlCiAgICAgIAogICAgICAgQCBzdG9yYWdlL2lubm9kYl9w
bHVnaW4vcm93L3JvdzBzZWwuYwogICAgICAgICAgaW5pdCBudWxsIGJ5dGVzIHdpdGggZGVmYXVs
dCB2YWx1ZXMgYXMgdGhleSBtaWdodCBiZQogICAgICAgICAgbGVmdCB1bmluaXRpYWxpemVkIGlu
IHNvbWUgY2FzZXMgYW5kIHRoZXNlIHVuaW5pdGVkIGJ5dGVzCiAgICAgICAgICBtaWdodCBiZSBj
b3BpZWQgaW50byBteXNxbCByZWNvcmQgYnVmZmVyIHRoYXQgbGVhZHMgdG8KICAgICAgICAgIHZh
bGdyaW5kIHdhcm5pbmdzIG9uIG5leHQgdXNlIG9mIHRoZSBidWZmZXIuCgogICAgbW9kaWZpZWQ6
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX215c3FsLnJlc3VsdAogICAg
ICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9teXNxbC50ZXN0CiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9z
dWl0ZS9pbm5vZGIvci9pbm5vZGJfbXlzcWwucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRl
L2lubm9kYi9yL2lubm9kYl9teXNxbC5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDA2MDgxMjI2NDUtcHNucmNsZzdqN24xeW52cworKysgYi9teXNxbC10ZXN0L3N1aXRl
L2lubm9kYi9yL2lubm9kYl9teXNxbC5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDA2MTQwNjM1MDEtazU1azExODh3c292eDM2cgpAQCAtMjQxMyw2ICsyNDEzLDE4IEBA
IGlkCXNlbGVjdF90eXBlCXRhYmxlCXR5cGUJcG9zc2libGVfa2V5cwogMQlTSU1QTEUJdDEJY29u
c3QJUFJJTUFSWQlOVUxMCU5VTEwJTlVMTAkxCUltcG9zc2libGUgT04gY29uZGl0aW9uCiAxCVNJ
TVBMRQl0MglBTEwJTlVMTAlOVUxMCU5VTEwJTlVMTAkzCVVzaW5nIHdoZXJlCiBEUk9QIFRBQkxF
IHQxLHQyOworIworIyBCdWcjMzg5OTkgdmFsZ3JpbmQgd2FybmluZ3MgZm9yIHVwZGF0ZSBzdGF0
ZW1lbnQgaW4gZnVuY3Rpb24gY29tcGFyZV9yZWNvcmQoKQorIworQ1JFQVRFIFRBQkxFIHQxIChh
IElOVCBQUklNQVJZIEtFWSkgRU5HSU5FPUlubm9EQjsKK0NSRUFURSBUQUJMRSB0MiAoYSBJTlQg
UFJJTUFSWSBLRVkpIEVOR0lORT1Jbm5vREI7CitJTlNFUlQgSU5UTyB0MSB2YWx1ZXMgKDEpLCgy
KSwoMyksKDQpLCg1KTsKK0lOU0VSVCBJTlRPIHQyIHZhbHVlcyAoMSk7CitTRUxFQ1QgKiBGUk9N
IHQxIFdIRVJFIGEgPSAyOworYQorMgorVVBEQVRFIHQxLHQyIFNFVCB0MS5hID0gdDEuYSArIDEw
MCBXSEVSRSB0MS5hID0gMTsKK0RST1AgVEFCTEUgdDEsdDI7CiBFbmQgb2YgNS4xIHRlc3RzCiAj
CiAjIFRlc3QgZm9yIGJ1ZyAjMzk5MzIgImNyZWF0ZSB0YWJsZSBmYWlscyBpZiBjb2x1bW4gZm9y
IEZLIGlzIGluIGRpZmZlcmVudAoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiL3QvaW5ub2RiX215c3FsLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3QvaW5ub2RiX215c3FsLnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2
MDgxMjI2NDUtcHNucmNsZzdqN24xeW52cworKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90
L2lubm9kYl9teXNxbC50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjE0
MDYzNTAxLWs1NWsxMTg4d3NvdngzNnIKQEAgLTY0OSw2ICs2NDksMjAgQEAgRVhQTEFJTiBTRUxF
Q1QgdDEuaWQsdDIuaWQgRlJPTSB0MiBMRUZUCiAKIERST1AgVEFCTEUgdDEsdDI7CiAKKy0tZWNo
byAjCistLWVjaG8gIyBCdWcjMzg5OTkgdmFsZ3JpbmQgd2FybmluZ3MgZm9yIHVwZGF0ZSBzdGF0
ZW1lbnQgaW4gZnVuY3Rpb24gY29tcGFyZV9yZWNvcmQoKQorLS1lY2hvICMKKworQ1JFQVRFIFRB
QkxFIHQxIChhIElOVCBQUklNQVJZIEtFWSkgRU5HSU5FPUlubm9EQjsKK0NSRUFURSBUQUJMRSB0
MiAoYSBJTlQgUFJJTUFSWSBLRVkpIEVOR0lORT1Jbm5vREI7CitJTlNFUlQgSU5UTyB0MSB2YWx1
ZXMgKDEpLCgyKSwoMyksKDQpLCg1KTsKK0lOU0VSVCBJTlRPIHQyIHZhbHVlcyAoMSk7CisKK1NF
TEVDVCAqIEZST00gdDEgV0hFUkUgYSA9IDI7CitVUERBVEUgdDEsdDIgU0VUIHQxLmEgPSB0MS5h
ICsgMTAwIFdIRVJFIHQxLmEgPSAxOworCitEUk9QIFRBQkxFIHQxLHQyOworCiAtLWVjaG8gRW5k
IG9mIDUuMSB0ZXN0cwogCiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jv
dy9yb3cwc2VsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwODEyMjY0NS1wc25yY2xnN2o3bjF5bnZzCisr
KyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEwMDYxNDA2MzUwMS1rNTVrMTE4OHdzb3Z4MzZyCkBAIC0yNjc4LDYgKzI2Nzgs
MTIgQEAgcm93X3NlbF9zdG9yZV9teXNxbF9yZWMoCiAJCXByZWJ1aWx0LT5ibG9iX2hlYXAgPSBO
VUxMOwogCX0KIAorCS8qIGluaXQgbnVsbCBieXRlcyB3aXRoIGRlZmF1bHQgdmFsdWVzIGFzIHRo
ZXkgbWlnaHQgYmUKKwlsZWZ0IHVuaW5pdGlhbGl6ZWQgaW4gc29tZSBjYXNlcyBhbmQgdGhlc2Ug
dW5pbml0ZWQgYnl0ZXMKKwltaWdodCBiZSBjb3BpZWQgaW50byBteXNxbCByZWNvcmQgYnVmZmVy
IHRoYXQgbGVhZHMgdG8KKwl2YWxncmluZCB3YXJuaW5ncyAqLworCW1lbWNweShteXNxbF9yZWMs
IHByZWJ1aWx0LT5kZWZhdWx0X3JlYywgcHJlYnVpbHQtPm51bGxfYml0bWFwX2xlbik7CisKIAlm
b3IgKGkgPSAwOyBpIDwgcHJlYnVpbHQtPm5fdGVtcGxhdGU7IGkrKykgewogCiAJCXRlbXBsID0g
cHJlYnVpbHQtPm15c3FsX3RlbXBsYXRlICsgaTsKCg==

--===============1075918717==
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.5-innodb/
# testament_sha1: 8a4aeab3831462bd93ae6604e00bf704e9ba64b2
# timestamp: 2010-06-14 09:35:14 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   psnrclg7j7n1ynvs
# 
# Begin bundle
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
/2K4


--===============1075918717==--