From: marko.makela
Date: April 26 2010 1:10pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3421)
List-Archive: http://lists.mysql.com/commits/106521
Message-Id: <201004261310.o3QD7B5Z023030@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0868929333=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA0MjYxMTI2MDktZjdsZ2w4
Y3J3NHg0c2ZrawoKIDM0MjEgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yNgogICAgICBsb2NrX3Jl
Y19xdWV1ZV92YWxpZGF0ZSgpOiBEaXNhYmxlIGEgYm9ndXMgY2hlY2sgdGhhdAogICAgICBhIHRy
YW5zYWN0aW9uIHRoYXQgaG9sZHMgYSBsb2NrIG9uIGEgY2x1c3RlcmVkIGluZGV4IHJlY29yZAog
ICAgICBhbHNvIGhvbGRzIGEgbG9jayBvbiB0aGUgc2Vjb25kYXJ5IGluZGV4IHJlY29yZC4KCiAg
ICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCiAgICAg
IHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9sb2NrL2xvY2swbG9jay5jCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2UvbG9jay9sb2NrMGxvY2suYwkyMDEwLTAyLTAzIDAxOjU3OjMyICswMDAwCisrKyBiL3N0b3Jh
Z2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2suYwkyMDEwLTA0LTI2IDEzOjEwOjI5ICswMDAwCkBA
IC00NTM4LDEzICs0NTM4LDM0IEBAIGxvY2tfcmVjX3F1ZXVlX3ZhbGlkYXRlKAogCQkJCQkgICAg
ICAgcmVjLCBpbXBsX3RyeCkpOwogCQl9CiAJfQotCisjaWYgMAogCWlmIChpbmRleCAmJiAhKGlu
ZGV4LT50eXBlICYgRElDVF9DTFVTVEVSRUQpKSB7CiAKIAkJLyogVGhlIGtlcm5lbCBtdXRleCBt
YXkgZ2V0IHJlbGVhc2VkIHRlbXBvcmFyaWx5IGluIHRoZQogCQluZXh0IGZ1bmN0aW9uIGNhbGw6
IHdlIGhhdmUgdG8gcmVsZWFzZSBsb2NrIHRhYmxlIG11dGV4CiAJCXRvIG9iZXkgdGhlIGxhdGNo
aW5nIG9yZGVyICovCiAKKwkJLyogTk9URTogVGhpcyBpcyBhIGJvZ3VzIGNoZWNrIHRoYXQgd291
bGQgZmFpbCBpbiB0aGUKKwkJZm9sbG93aW5nIGNhc2U6IE91ciB0cmFuc2FjdGlvbiBpcyB1cGRh
dGluZyBhCisJCXJvdy4gQWZ0ZXIgaXQgaGFzIHVwZGF0ZWQgdGhlIGNsdXN0ZXJlZCBpbmRleCBy
ZWNvcmQsCisJCWl0IGdvZXMgdG8gYSBzZWNvbmRhcnkgaW5kZXggcmVjb3JkIGFuZCBmaW5kcyBz
b21lb25lCisJCWVsc2UgaG9sZGluZyBhbiBleHBsaWNpdCBTLSBvciBYLWxvY2sgb24gdGhhdAor
CQlzZWNvbmRhcnkgaW5kZXggcmVjb3JkLCBwcmVzdW1hYmx5IGZyb20gYSBsb2NraW5nCisJCXJl
YWQuIE91ciB0cmFuc2FjdGlvbiBjYW5ub3QgdXBkYXRlIHRoZSBzZWNvbmRhcnkKKwkJaW5kZXgg
aW1tZWRpYXRlbHksIGJ1dCBwbGFjZXMgYSB3YWl0aW5nIFgtbG9jayByZXF1ZXN0CisJCW9uIHRo
ZSBzZWNvbmRhcnkgaW5kZXggcmVjb3JkLiBUaGVyZSBpcyBub3RoaW5nCisJCWlsbGVnYWwgaW4g
dGhpcy4gVGhlIGFzc2VydGlvbiBpcyBzaW1wbHkgdG9vIHN0cm9uZy4gKi8KKworCQkvKiBGcm9t
IHRoZSBsb2NraW5nIHBvaW50IG9mIHZpZXcsIGVhY2ggc2Vjb25kYXJ5CisJCWluZGV4IGlzIGEg
c2VwYXJhdGUgdGFibGUuIEEgbG9jayB0aGF0IGlzIGhlbGQgb24KKwkJc2Vjb25kYXJ5IGluZGV4
IHJlYyBkb2VzIG5vdCBnaXZlIGFueSByaWdodHMgdG8gbW9kaWZ5CisJCW9yIHJlYWQgdGhlIGNs
dXN0ZXJlZCBpbmRleCByZWMuIFRoZXJlZm9yZSwgd2UgY2FuCisJCXRoaW5rIG9mIHRoZSBzZWMg
aW5kZXggYXMgYSBzZXBhcmF0ZSAndGFibGUnIGZyb20gdGhlCisJCWNsdXN0IGluZGV4ICd0YWJs
ZScuIENvbnZlcnNlbHksIGEgdHJhbnNhY3Rpb24gdGhhdAorCQloYXMgYWNxdWlyZWQgYSBsb2Nr
IG9uIGFuZCBtb2RpZmllZCBhIGNsdXN0ZXJlZCBpbmRleAorCQlyZWNvcmQgbWF5IG5lZWQgdG8g
d2FpdCBmb3IgYSBsb2NrIG9uIHRoZQorCQljb3JyZXNwb25kaW5nIHJlY29yZCBpbiBhIHNlY29u
ZGFyeSBpbmRleC4gKi8KKwogCQlpbXBsX3RyeCA9IGxvY2tfc2VjX3JlY19zb21lX2hhc19pbXBs
X29mZl9rZXJuZWwoCiAJCQlyZWMsIGluZGV4LCBvZmZzZXRzKTsKIApAQCAtNDU1NSw3ICs0NTc2
LDcgQEAgbG9ja19yZWNfcXVldWVfdmFsaWRhdGUoCiAJCQkJCSAgICAgICByZWMsIGltcGxfdHJ4
KSk7CiAJCX0KIAl9Ci0KKyNlbmRpZgogCWxvY2sgPSBsb2NrX3JlY19nZXRfZmlyc3QocmVjKTsK
IAogCXdoaWxlIChsb2NrKSB7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL2xvY2svbG9jazBsb2NrLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9sb2NrL2xv
Y2swbG9jay5jCTIwMTAtMDItMjAgMTY6NDU6NDEgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL2xvY2svbG9jazBsb2NrLmMJMjAxMC0wNC0yNiAxMzoxMDoyOSArMDAwMApAQCAtNDcx
MCw2ICs0NzEwLDcgQEAgbG9ja19yZWNfcXVldWVfdmFsaWRhdGUoCiAJCQl1dF9hKGxvY2tfcmVj
X2hhc19leHBsKExPQ0tfWCB8IExPQ0tfUkVDX05PVF9HQVAsCiAJCQkJCSAgICAgICBibG9jaywg
aGVhcF9ubywgaW1wbF90cngpKTsKIAkJfQorI2lmIDAKIAl9IGVsc2UgewogCiAJCS8qIFRoZSBr
ZXJuZWwgbXV0ZXggbWF5IGdldCByZWxlYXNlZCB0ZW1wb3JhcmlseSBpbiB0aGUKQEAgLTQ3MjAs
NiArNDcyMSwyNyBAQCBsb2NrX3JlY19xdWV1ZV92YWxpZGF0ZSgKIAkJKGZpbF9zcGFjZV90Ojps
YXRjaCksIHRoZSBmb2xsb3dpbmcgY2hlY2sgV0lMTCBicmVhawogCQlsYXRjaGluZyBvcmRlciBh
bmQgbWF5IGNhdXNlIGEgZGVhZGxvY2sgb2YgdGhyZWFkcy4gKi8KIAorCQkvKiBOT1RFOiBUaGlz
IGlzIGEgYm9ndXMgY2hlY2sgdGhhdCB3b3VsZCBmYWlsIGluIHRoZQorCQlmb2xsb3dpbmcgY2Fz
ZTogT3VyIHRyYW5zYWN0aW9uIGlzIHVwZGF0aW5nIGEKKwkJcm93LiBBZnRlciBpdCBoYXMgdXBk
YXRlZCB0aGUgY2x1c3RlcmVkIGluZGV4IHJlY29yZCwKKwkJaXQgZ29lcyB0byBhIHNlY29uZGFy
eSBpbmRleCByZWNvcmQgYW5kIGZpbmRzIHNvbWVvbmUKKwkJZWxzZSBob2xkaW5nIGFuIGV4cGxp
Y2l0IFMtIG9yIFgtbG9jayBvbiB0aGF0CisJCXNlY29uZGFyeSBpbmRleCByZWNvcmQsIHByZXN1
bWFibHkgZnJvbSBhIGxvY2tpbmcKKwkJcmVhZC4gT3VyIHRyYW5zYWN0aW9uIGNhbm5vdCB1cGRh
dGUgdGhlIHNlY29uZGFyeQorCQlpbmRleCBpbW1lZGlhdGVseSwgYnV0IHBsYWNlcyBhIHdhaXRp
bmcgWC1sb2NrIHJlcXVlc3QKKwkJb24gdGhlIHNlY29uZGFyeSBpbmRleCByZWNvcmQuIFRoZXJl
IGlzIG5vdGhpbmcKKwkJaWxsZWdhbCBpbiB0aGlzLiBUaGUgYXNzZXJ0aW9uIGlzIHNpbXBseSB0
b28gc3Ryb25nLiAqLworCisJCS8qIEZyb20gdGhlIGxvY2tpbmcgcG9pbnQgb2YgdmlldywgZWFj
aCBzZWNvbmRhcnkKKwkJaW5kZXggaXMgYSBzZXBhcmF0ZSB0YWJsZS4gQSBsb2NrIHRoYXQgaXMg
aGVsZCBvbgorCQlzZWNvbmRhcnkgaW5kZXggcmVjIGRvZXMgbm90IGdpdmUgYW55IHJpZ2h0cyB0
byBtb2RpZnkKKwkJb3IgcmVhZCB0aGUgY2x1c3RlcmVkIGluZGV4IHJlYy4gVGhlcmVmb3JlLCB3
ZSBjYW4KKwkJdGhpbmsgb2YgdGhlIHNlYyBpbmRleCBhcyBhIHNlcGFyYXRlICd0YWJsZScgZnJv
bSB0aGUKKwkJY2x1c3QgaW5kZXggJ3RhYmxlJy4gQ29udmVyc2VseSwgYSB0cmFuc2FjdGlvbiB0
aGF0CisJCWhhcyBhY3F1aXJlZCBhIGxvY2sgb24gYW5kIG1vZGlmaWVkIGEgY2x1c3RlcmVkIGlu
ZGV4CisJCXJlY29yZCBtYXkgbmVlZCB0byB3YWl0IGZvciBhIGxvY2sgb24gdGhlCisJCWNvcnJl
c3BvbmRpbmcgcmVjb3JkIGluIGEgc2Vjb25kYXJ5IGluZGV4LiAqLworCiAJCWltcGxfdHJ4ID0g
bG9ja19zZWNfcmVjX3NvbWVfaGFzX2ltcGxfb2ZmX2tlcm5lbCgKIAkJCXJlYywgaW5kZXgsIG9m
ZnNldHMpOwogCkBAIC00NzMwLDYgKzQ3NTIsNyBAQCBsb2NrX3JlY19xdWV1ZV92YWxpZGF0ZSgK
IAkJCXV0X2EobG9ja19yZWNfaGFzX2V4cGwoTE9DS19YIHwgTE9DS19SRUNfTk9UX0dBUCwKIAkJ
CQkJICAgICAgIGJsb2NrLCBoZWFwX25vLCBpbXBsX3RyeCkpOwogCQl9CisjZW5kaWYKIAl9CiAK
IAlsb2NrID0gbG9ja19yZWNfZ2V0X2ZpcnN0KGJsb2NrLCBoZWFwX25vKTsKCg==

--===============0868929333==
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: 487174e3f4d25a0b30dcc9774570957439cc5c10
# timestamp: 2010-04-26 16:10:39 +0300
# base_revision_id: marko.makela@stripped\
#   f7lgl8crw4x4sfkk
# 
# Begin bundle
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


--===============0868929333==--