From: marko.makela
Date: May 4 2010 10:53am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3438)
List-Archive: http://lists.mysql.com/commits/107292
Message-Id: <201005041053.o44AjDxu003898@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0923340052=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDQwOTMxMjgtNDR2Nmds
dXBlMWRzaDB1ZwoKIDM0MzggTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBSZW1vdmUg
VU5JVl9CVFJfQVZPSURfQ09QWS4gSXQgd2FzIGJyb2tlbiBiZWNhdXNlIGJ0cl9hdHRhY2hfaGFs
Zl9wYWdlcygpCiAgICAgIHdvdWxkIGdldCB0aGUgYmxvY2ssIG5ld19ibG9jayBpbiB0aGUgd3Jv
bmcgb3JkZXIuCiAgICAgIEZpeGluZyB0aGF0IHdvdWxkIGhhdmUgY29tcGxpY2F0ZWQgdGhlIGZ1
bmN0aW9uIGV2ZW4gZnVydGhlcgogICAgICBmb3IgdGhpcyBtYXJnaW5hbCBjYXNlLgoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBidHIuYwogICAgICBz
dG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS91bml2LmkKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGJ0ci5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9w
bHVnaW4vYnRyL2J0cjBidHIuYwkyMDEwLTA1LTA0IDA5OjMxOjI4ICswMDAwCisrKyBiL3N0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGJ0ci5jCTIwMTAtMDUtMDQgMTA6NTM6MjQgKzAwMDAK
QEAgLTIwNDYsMTcgKzIwNDYsNyBAQCBpbnNlcnRfZW1wdHk6CiAJfQogCiAJLyogNS4gTW92ZSB0
aGVuIHRoZSByZWNvcmRzIHRvIHRoZSBuZXcgcGFnZSAqLwotCWlmIChkaXJlY3Rpb24gPT0gRlNQ
X0RPV04KLSNpZmRlZiBVTklWX0JUUl9BVk9JRF9DT1BZCi0JICAgICYmIHBhZ2VfcmVjX2lzX3N1
cHJlbXVtKG1vdmVfbGltaXQpKSB7Ci0JCS8qIEluc3RlYWQgb2YgbW92aW5nIGFsbCByZWNvcmRz
LCBtYWtlIHRoZSBuZXcgcGFnZQotCQl0aGUgZW1wdHkgcGFnZS4gKi8KLQotCQlsZWZ0X2Jsb2Nr
ID0gYmxvY2s7Ci0JCXJpZ2h0X2Jsb2NrID0gbmV3X2Jsb2NrOwotCX0gZWxzZSBpZiAoZGlyZWN0
aW9uID09IEZTUF9ET1dOCi0jZW5kaWYgLyogVU5JVl9CVFJfQVZPSURfQ09QWSAqLwotCQkgICAp
IHsKKwlpZiAoZGlyZWN0aW9uID09IEZTUF9ET1dOKSB7CiAJCS8qCQlmcHV0cygiU3BsaXQgbGVm
dFxuIiwgc3RkZXJyKTsgKi8KIAogCQlpZiAoMApAQCAtMjA5OSwxNCArMjA4OSw2IEBAIGluc2Vy
dF9lbXB0eToKIAkJcmlnaHRfYmxvY2sgPSBibG9jazsKIAogCQlsb2NrX3VwZGF0ZV9zcGxpdF9s
ZWZ0KHJpZ2h0X2Jsb2NrLCBsZWZ0X2Jsb2NrKTsKLSNpZmRlZiBVTklWX0JUUl9BVk9JRF9DT1BZ
Ci0JfSBlbHNlIGlmICghc3BsaXRfcmVjKSB7Ci0JCS8qIEluc3RlYWQgb2YgbW92aW5nIGFsbCBy
ZWNvcmRzLCBtYWtlIHRoZSBuZXcgcGFnZQotCQl0aGUgZW1wdHkgcGFnZS4gKi8KLQotCQlsZWZ0
X2Jsb2NrID0gbmV3X2Jsb2NrOwotCQlyaWdodF9ibG9jayA9IGJsb2NrOwotI2VuZGlmIC8qIFVO
SVZfQlRSX0FWT0lEX0NPUFkgKi8KIAl9IGVsc2UgewogCQkvKgkJZnB1dHMoIlNwbGl0IHJpZ2h0
XG4iLCBzdGRlcnIpOyAqLwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL2luY2x1ZGUvdW5pdi5pJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS91
bml2LmkJMjAxMC0wNC0yNiAwODozNTo1NyArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVn
aW4vaW5jbHVkZS91bml2LmkJMjAxMC0wNS0wNCAxMDo1MzoyNCArMDAwMApAQCAtMjA1LDEwICsy
MDUsNiBAQCBvcGVyYXRpb25zICh2ZXJ5IHNsb3cpOyBhbHNvIFVOSVZfREVCVUcKIAkJCQkJCWFk
YXB0aXZlIGhhc2ggaW5kZXggKi8KICNkZWZpbmUgVU5JVl9TUlZfUFJJTlRfTEFUQ0hfV0FJVFMJ
CS8qIGVuYWJsZSBkaWFnbm9zdGljIG91dHB1dAogCQkJCQkJaW4gc3luYzBzeW5jLmMgKi8KLSNk
ZWZpbmUgVU5JVl9CVFJfQVZPSURfQ09QWQkJCS8qIHdoZW4gc3BsaXR0aW5nIEItdHJlZSBub2Rl
cywKLQkJCQkJCWRvIG5vdCBtb3ZlIGFueSByZWNvcmRzIHdoZW4KLQkJCQkJCWFsbCB0aGUgcmVj
b3JkcyB3b3VsZAotCQkJCQkJYmUgbW92ZWQgKi8KICNkZWZpbmUgVU5JVl9CVFJfUFJJTlQJCQkJ
LyogZW5hYmxlIGZ1bmN0aW9ucyBmb3IKIAkJCQkJCXByaW50aW5nIEItdHJlZXMgKi8KICNkZWZp
bmUgVU5JVl9aSVBfREVCVUcJCQkJLyogZXh0ZW5zaXZlIGNvbnNpc3RlbmN5IGNoZWNrcwoK

--===============0923340052==
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-innodb/
# testament_sha1: cf900870b1956bdf98b319c2033cda09ac633842
# timestamp: 2010-05-04 13:53:40 +0300
# base_revision_id: marko.makela@stripped\
#   44v6glupe1dsh0ug
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWfG1FAAAlTfgEAwW2f//38j
36C/7//4UATMngA2wJU0DCSU0Cano1T9U3iep6hqZMmhGTQaA0yZlMymhzAEYJiAYBME0ZDQwCYI
xMNNCRT0jTTan6ieITRo9IGg0Gho0aGgBzAEYJiAYBME0ZDQwCYIxMJIiAEwTRMU2I0xTNImj0eq
ZABhBidVbx3ZvVj+d3f92mkWBMqGoLMznyBCWJLK7b7J75b5o+LR5bNKTi6CSSBpuAankFpbRDKo
adnZyZa40aHOo1MpI/fe2GfSjvLIox+19gLpCNGaxJAONei5GajDfqqJpojLBhmxoUT7nCNhEphl
MS9u7ZBjP0/bBlE+dClDaLSKRwrX5NzgPb5Y8cdsiYSt3rUhRFq0apT5opkBMzXN4uXiW4ghMLSB
IQa3G8FCJkzgnnAoFGIxQROcjxoSdjFaTid3uFqC8Wah39bWoVQHMsqbxkFFwwDR811UxXN8BWYy
WvOnFoMxUFh9LQOG/AyEr1awqBvQrMOtgFap8C6jJwznak6KerDN1ESBYVhUT6w1iNo5BOSahMRF
E1E5nJSaaOFQDCtVA4F8HY0A5SrLs8gs5CFB9cA3yUs98PewKeDxrHA5YVDrN9gJhyUWBePBYjk4
sjDhPXpfXaWHYZnvMwoS1hAgKcc/zaFFFtxC/NaKn47FMUGBAcUl5UQuDArEeWe+jXJaNniDittP
UJ8jQ7WFsLaaSkuGKiLy2VCnITSuFpQKtrwipMrK0yoCStToluFB+bN3fiXsl2semcVnaiARMMbh
8gKLexVpkytBRKytEJTiICfluBJKaLwY8XYZwImPLtjKeG/ht3T7+Gf06KfSuffww0uv7O7TBmvT
C9r7pJN7JxcBdDtPuPYeZ5nwQv+nKemAlf0LiCI4gfwhY4fs6pmj0nAm/pkKjH2QmYh5tDvcV5J7
j4nqMcx2CyInhY1/m/JbUxCH5genuAYpMBdTqdxUdTbKSCzl45kBm3VyC0C8CU/Krsn+L/KDOJRU
MRKsrjyHMxlsNBnJgiDZFQESzMK1cLqRbFf/W4KPWBw4c30EDWowAPpUF5oIEmw2lheafE4qc9W7
pYqUaK8RymmFWC93iJdjPcMmFQ8rnueFWgaxNHqoQXTolmu4hPynIaqcxDKQM5kE5SGFbTWWLHY5
y/djjE4h3gPHVgHz2mXdoBhhdH7aGWZjncDD15GxWUASH+zq3jFUw9KUkqNHUtaK/WHuzRz0YWYD
lAr5bEHHQrZjs2KImt+2SF01I2CWwiwc2VQOhd5ApEmRJ62j5HC2ZdoNYJdyFqu9vBfyODGC6Wo2
GcU7CxksI88FgQVUAGynPKyRKCEFUvRBAGp4aEQYTJ/AS39hLiaQCZI4wFP9RLgi6C7YK/8DQbmm
3sa9esL5VoCkHrhNMNT78AMNOqq9QYTJnSDY0t8oFXLAsZQjTK4lOqacZLgunJmJhOp7IkRmuJZJ
sZfLmEFUpaUDlIb89CmFM/yd+YHHbE1nkFWDxhpCVg2tk45uJ0ULsENaJiVgpxgd4GVa9oWG88TT
OKUM0lVS5cgptaTTcqZoILQOHpDWBdrYxRorezNDY1UqvdNZACj/i7kinChIM+NqKAA=


--===============0923340052==--