From: marko.makela
Date: November 2 2010 7:42am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3646 to 3648) Bug#57799
List-Archive: http://lists.mysql.com/commits/122497
X-Bug: 57799
Message-Id: <201011020743.oA27Zrki012781@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0960650884=="

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

IDM2NDggTWFya28gTcOka2Vsw6QJMjAxMC0xMS0wMgogICAgICBCdWcjNTc3OTkgUkVBRCBVTkNP
TU1JVFRFRCBhY2Nlc3MgZmFpbHVyZSBvZiBvZmYtcGFnZSBEWU5BTUlDIG9yIENPTVBSRVNTRUQK
ICAgICAgY29sdW1ucyBhZ2FpbgogICAgICAKICAgICAgVGhpcyBpcyBmb2xsb3ctdXAgdG8gQnVn
ICM1NDM1OC4gTm90IGFsbCBvY2N1cnJlbmNlcyBvZiB0aGUgYnVnIHdlcmUgZml4ZWQuCiAgICAg
IFdlIG5lZWQgdG8gY2hlY2sgYWxsIGNhbGxzIHRvIGJ0cl9jb3B5X2V4dGVybmFsbHlfc3RvcmVk
X2ZpZWxkX3ByZWZpeF9sb3coKQogICAgICBhbmQgZG8gdGhlIHJpZ2h0IHRoaW5nIHdoZW4gdGhl
IHBvaW50ZXIgdG8gdGhlIG9mZi1wYWdlIGNvbHVtbiBpcyBudWxsCiAgICAgIChmdWxsIG9mIHpl
cm8gYnl0ZXMpLgogICAgICAKICAgICAgSXQgdHVybnMgb3V0IHRoYXQgb25seSB0aGUgY2FsbCB0
byBidHJfY29weV9leHRlcm5hbGx5X3N0b3JlZF9maWVsZF9wcmVmaXgoKQogICAgICBpbiByb3df
c2VsX3NlY19yZWNfaXNfZm9yX2Jsb2IoKSBuZWVkcyB0byBiZSBjaGFuZ2VkLgogICAgICAKICAg
ICAgRm9yIGZldGNoaW5nIGNvbXBsZXRlIG9mZi1wYWdlIGNvbHVtbnMgcmF0aGVyIHRoYW4gcHJl
Zml4ZXMsIHRoZSBmdW5jdGlvbgogICAgICBidHJfcmVjX2NvcHlfZXh0ZXJuYWxseV9zdG9yZWRf
ZmllbGQoKSBhbHJlYWR5IGNoZWNrcyBpZiB0aGUgcG9pbnRlcgogICAgICBpcyBudWxsIChhbGwt
emVybykuICBUd28gb2YgaXRzIGNhbGxlcnMgKHJvd19tZXJnZV9jb3B5X2Jsb2JzKCkgYW5kCiAg
ICAgIHJvd19zZWxfZmV0Y2hfY29sdW1ucygpKSBhcmUgbmV2ZXIgZXhlY3V0ZWQgYXMgUkVBRCBD
T01NSVRURUQgYW5kIGNhbgogICAgICByaWdodGZ1bGx5IGFzc2VydCB0aGF0IHRoZSBmZXRjaCBz
dWNjZWVkZWQuICBUaGUgdGhpcmQgY2FsbGVyLAogICAgICByb3dfc2VsX3N0b3JlX215c3FsX3Jl
YygpLCBhbHJlYWR5IGRvZXMgdGhlIHJpZ2h0IHRoaW5nLgogICAgICAKICAgICAgVGhlIGNhbGxz
IGluIHJvd191cGRfZXh0X2ZldGNoKCkgYW5kIHRyeF91bmRvX3BhZ2VfZmV0Y2hfZXh0KCkgbXVz
dAogICAgICBleHBlY3QgdGhhdCB0aGUgb2ZmLXBhZ2UgY29sdW1uIGV4aXN0cy4gVXBkYXRlIGFu
ZCByb2xsYmFjayBhcmUKICAgICAgbG9ja2luZyBvcGVyYXRpb25zLCBuZXZlciBSRUFEIFVOQ09N
TUlUVEVELgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdl
TG9nCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jCiAzNjQ3IE1hcmtv
IE3DpGtlbMOkCTIwMTAtMTEtMDIKICAgICAgV2hpdGUtc3BhY2UgY29ycmVjdGlvbnMgaW4gdGhl
IElubm9EQiBQbHVnaW4gQ2hhbmdlTG9nCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9DaGFuZ2VMb2cKIDM2NDYgQ2FsdmluIFN1bgkyMDEwLTEwLTI4CiAgICAgIEJ1
ZyM1MjA2MjogQ29tcGlsZXIgd2FybmluZyBpbiBvczBmaWxlLmMgb24gd2luZG93cyA2NC1iaXQK
ICAgICAgT24gV2luZG93cywgdGhlIHBhcmFtZXRlciBmb3IgbnVtYmVyIG9mIGJ5dGVzIHBhc3Nl
ZCBpbnRvIFdyaXRlRmlsZSgpCiAgICAgIGFuZCBSZWFkRmlsZSgpIGlzIERXT1JELiBDYXN0aW5n
IGlzIG5lZWRlZCB0byBzaWxlbmNlIHRoZSB3YXJuaW5nIG9uCiAgICAgIDY0LWJpdCBXaW5kb3dz
LgogICAgICAKICAgICAgQWxzbywgYWRkaW5nIHNldmVyYWwgYXNzZXJ0cyB0byBlbnN1cmUgdGhl
IHZhcmlhYmxlIGZvciBudW1iZXIgb2YgYnl0ZXMKICAgICAgaXMgbm8gbW9yZSB0aGFuIDMyIGJp
dHMsIGV2ZW4gb24gNjQtYml0IFdpbmRvd3MuCiAgICAgIAogICAgICBUaGlzIGlzIGZvciBJbm5v
REIgUGx1Z2luLgogICAgICAKICAgICAgcmI6Ly80MTUKICAgICAgQXBwcm92ZWQgYnk6IEluYWFt
CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9vcy9vczBmaWxlLmMK
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBh
L3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6Y2FsdmluLnN1bkBvcmFjbGUu
Y29tLTIwMTAxMDI4MDUxMDI4LWpnZDVpemV5Z2pma3dteTYKKysrIGIvc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMjA3
Mjg0OC11dWZlMGM1eHp0YjUxcDBtCkBAIC0xLDEzICsxLDE5IEBACisyMDEwLTExLTAyCVRoZSBJ
bm5vREIgVGVhbQorCisJKiByb3cvcm93MHNlbC5jOgorCUZpeCBCdWcjNTc3OTkgUkVBRCBVTkNP
TU1JVFRFRCBhY2Nlc3MgZmFpbHVyZSBvZiBvZmYtcGFnZQorCURZTkFNSUMgb3IgQ09NUFJFU1NF
RCBjb2x1bW5zIGFnYWluCisKIDIwMTAtMTAtMjQJVGhlIElubm9EQiBUZWFtCiAKIAkqIHJvdy9y
b3cwbXlzcWwuYwotCUZpeCBCdWcgIzU3NzAwIExhdGNoaW5nIG9yZGVyIHZpb2xhdGlvbiBpbgor
CUZpeCBCdWcjNTc3MDAgTGF0Y2hpbmcgb3JkZXIgdmlvbGF0aW9uIGluCiAJcm93X3RydW5jYXRl
X3RhYmxlX2Zvcl9teXNxbCgpCiAKIDIwMTAtMTAtMjAJVGhlIElubm9EQiBUZWFtCiAKIAkqIGRp
Y3QvZGljdDBsb2FkLmMKLQlGaXggQnVnICM1NzYxNiBTaWcgMTEgaW4gZGljdF9sb2FkX3RhYmxl
KCkgd2hlbiBmYWlsZWQgdG8gbG9hZAorCUZpeCBCdWcjNTc2MTYgU2lnIDExIGluIGRpY3RfbG9h
ZF90YWJsZSgpIHdoZW4gZmFpbGVkIHRvIGxvYWQKIAlpbmRleCBvciBmb3JlaWduIGtleQogCiAy
MDEwLTEwLTE5CVRoZSBJbm5vREIgVGVhbQpAQCAtMTcsNyArMjMsNyBAQAogCWluY2x1ZGUvaWJ1
ZjBpYnVmLmgsIGluY2x1ZGUvcm93MG15c3FsLmgsCiAJcm93L3JvdzBteXNxbC5jLCByb3cvcm93
MHNlbC5jLAogCWlubm9kYl9idWc1NjY4MC50ZXN0LCBpbm5vZGJfYnVnNTY2ODAucmVzdWx0Ogot
CUZpeCBCdWcgIzU2NjgwIElubm9EQiBtYXkgcmV0dXJuIHdyb25nIHJlc3VsdHMgZnJvbSBhCisJ
Rml4IEJ1ZyM1NjY4MCBJbm5vREIgbWF5IHJldHVybiB3cm9uZyByZXN1bHRzIGZyb20gYQogCWNh
c2UtaW5zZW5zaXRpdmUgY292ZXJpbmcgaW5kZXgKIAogMjAxMC0xMC0xOAlUaGUgSW5ub0RCIFRl
YW0KQEAgLTYxLDcgKzY3LDcgQEAKIDIwMTAtMDgtMDMJVGhlIElubm9EQiBUZWFtCiAKIAkqIGlu
Y2x1ZGUvZGljdDBkaWN0LmgsIGluY2x1ZGUvZGljdDBkaWN0LmljLCByb3cvcm93MG15c3FsLmM6
Ci0JRml4IGJ1ZyAjNTQ2NzgsIElubm9EQiwgVFJVTkNBVEUsIEFMVEVSLCBJX1MgU0VMRUNULCBj
cmFzaCBvciBkZWFkbG9jaworCUZpeCBCdWcjNTQ2NzggSW5ub0RCLCBUUlVOQ0FURSwgQUxURVIs
IElfUyBTRUxFQ1QsIGNyYXNoIG9yIGRlYWRsb2NrCiAKIDIwMTAtMDgtMDMJVGhlIElubm9EQiBU
ZWFtCiAKQEAgLTEzNSw3ICsxNDEsNyBAQAogCiAJKiBkaWN0L2RpY3QwbG9hZC5jLCBmaWwvZmls
MGZpbC5jOgogCUZpeCBCdWcjNTQ2NTg6IElubm9EQjogV2FybmluZzogYWxsb2NhdGVkIHRhYmxl
c3BhY2UgJWx1LAotCW9sZCBtYXhpbXVtIHdhcyAwIChpbnRyb2R1Y2VkIGluIEJ1ZyAjNTM1Nzgg
Zml4KQorCW9sZCBtYXhpbXVtIHdhcyAwIChpbnRyb2R1Y2VkIGluIEJ1ZyM1MzU3OCBmaXgpCiAK
IDIwMTAtMDYtMTYJVGhlIElubm9EQiBUZWFtCiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9kYl9wbHVnaW4vcm93L3JvdzBzZWwuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L3Jvdy9yb3cwc2VsLmMJcmV2aWQ6Y2FsdmluLnN1bkBvcmFjbGUuY29tLTIwMTAxMDI4MDUxMDI4
LWpnZDVpemV5Z2pma3dteTYKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2Vs
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDExMDIwNzI4NDgtdXVmZTBjNXh6
dGI1MXAwbQpAQCAtMTA2LDYgKzEwNiwxOCBAQCByb3dfc2VsX3NlY19yZWNfaXNfZm9yX2Jsb2Io
CiAJdWxpbnQJbGVuOwogCWJ5dGUJYnVmW0RJQ1RfTUFYX0lOREVYX0NPTF9MRU5dOwogCisJdXRf
YShjbHVzdF9sZW4gPj0gQlRSX0VYVEVSTl9GSUVMRF9SRUZfU0laRSk7CisKKwlpZiAoVU5JVl9V
TkxJS0VMWQorCSAgICAoIW1lbWNtcChjbHVzdF9maWVsZCArIGNsdXN0X2xlbiAtIEJUUl9FWFRF
Uk5fRklFTERfUkVGX1NJWkUsCisJCSAgICAgZmllbGRfcmVmX3plcm8sIEJUUl9FWFRFUk5fRklF
TERfUkVGX1NJWkUpKSkgeworCQkvKiBUaGUgZXh0ZXJuYWxseSBzdG9yZWQgZmllbGQgd2FzIG5v
dCB3cml0dGVuIHlldC4KKwkJVGhpcyByZWNvcmQgc2hvdWxkIG9ubHkgYmUgc2VlbiBieQorCQly
ZWN2X3JlY292ZXJ5X3JvbGxiYWNrX2FjdGl2ZSgpIG9yIGFueQorCQlUUlhfSVNPX1JFQURfVU5D
T01NSVRURUQgdHJhbnNhY3Rpb25zLiAqLworCQlyZXR1cm4oRkFMU0UpOworCX0KKwogCWxlbiA9
IGJ0cl9jb3B5X2V4dGVybmFsbHlfc3RvcmVkX2ZpZWxkX3ByZWZpeChidWYsIHNpemVvZiBidWYs
CiAJCQkJCQkgICAgICB6aXBfc2l6ZSwKIAkJCQkJCSAgICAgIGNsdXN0X2ZpZWxkLCBjbHVzdF9s
ZW4pOwoK

--===============0960650884==
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: 39440610118e4bec782d6edb80d5ccac20e8c71e
# timestamp: 2010-11-02 09:43:22 +0200
# base_revision_id: calvin.sun@stripped\
#   jgd5izeygjfkwmy6
# 
# Begin bundle
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


--===============0960650884==--