From: marko.makela
Date: June 22 2011 8:43am
Subject: bzr push into mysql-5.5 branch (marko.makela:3464 to 3465) Bug#11753728
List-Archive: http://lists.mysql.com/commits/139657
X-Bug: 11753728
Message-Id: <201106220844.p5M8iRap002454@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0068278073=="

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

IDM0NjUgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0yMgogICAgICBCdWcjMTE3NTM3MjggNDUyMjU6
IExvY2tpbmc6IGhhbmcgaWYgZHJvcCB0YWJsZSB3aXRoIG5vIHRpbWVvdXQKICAgICAgUmUtZW5h
YmxlIGEgdGVzdCB0aGF0IHdhcyBkaXNhYmxlZCBhcyBjb2xsYXRlcmFsIGRhbWFnZS4KICAgICAg
CiAgICAgIFN0YXJ0aW5nIHdpdGggTXlTUUwgNS41LCBxdWVyaWVzIHdpbGwgYWNxdWlyZSBhbmQg
aG9sZCBhIHNoYXJlZCBtZXRhLWRhdGEgbG9jawogICAgICAoTURMKSBvbiB0YWJsZXMgdGhleSBw
cm9jZXNzLCB1bnRpbCB0aGUgdHJhbnNhY3Rpb24gaXMgY29tbWl0dGVkIG9yCiAgICAgIHJvbGxl
ZCBiYWNrLiBUaGlzIHdpbGwgcHJldmVudCBEREwgb3BlcmF0aW9ucyBvbiB0aGUgdGFibGVzLCBz
dWNoIGFzIGNyZWF0aW5nCiAgICAgIGFuIGluZGV4LgogICAgICAKICAgICAgaW5ub2RiLWluZGV4
LnRlc3Q6IFVzZSBhIHNlY29uZCB0YWJsZSBmb3IgY3JlYXRpbmcgdGhlIGluZGV4LiBUaGUgaW5k
ZXggd2lsbAogICAgICBzdGlsbCBiZSAidG9vIG5ldyIgZm9yIHRoZSB0cmFuc2FjdGlvbiB0aGF0
IHdhcyBzdGFydGVkIGJlZm9yZSB0aGUgaW5kZXgKICAgICAgY3JlYXRpb24gd2FzIHN0YXJ0ZWQu
CgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWlu
ZGV4LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC50
ZXN0CiAzNDY0IEluYWFtIFJhbmEJMjAxMS0wNi0yMAogICAgICBGaXggYSBtZXJnZSBlcnJvciBp
bnRyb2R1Y2VkIGluOgogICAgICByZXZpc2lvbi1pZDogaW5hYW0ucmFuYUBvcmFjbGUuY29tLTIw
MTEwNjE3MjAyOTE5LWI3cDB1MGVrajVhOXU5bnUKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9idWYvYnVmMGJ1Zi5jCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1
aXRlL2lubm9kYi9yL2lubm9kYi1pbmRleC5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiL3IvaW5ub2RiLWluZGV4LnJlc3VsdAlyZXZpZDppbmFhbS5yYW5hQG9yYWNsZS5jb20t
MjAxMTA2MjAwNDM3MzYteDVwY2F4dWl1bHZxbXl2bQorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lu
bm9kYi9yL2lubm9kYi1pbmRleC5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMTA2MjIwODIwMTktNWI0eWw5YTlpY3N6dXo2YwpAQCAtMTA4NSwzICsxMDg1LDQzIEBAIHQy
CUNSRUFURSBUQUJMRSBgdDJgICgKICkgRU5HSU5FPUlubm9EQiBERUZBVUxUIENIQVJTRVQ9bGF0
aW4xCiBEUk9QIFRBQkxFIHQyOwogRFJPUCBUQUJMRSB0MTsKK0NSRUFURSBUQUJMRSB0MSAoYSBJ
TlQsIGIgQ0hBUigxKSkgRU5HSU5FPUlubm9EQjsKK0lOU0VSVCBJTlRPIHQxIFZBTFVFUyAoMywn
YScpLCgzLCdiJyksKDEsJ2MnKSwoMCwnZCcpLCgxLCdlJyk7CitDUkVBVEUgVEFCTEUgdDIgU0VM
RUNUICogRlJPTSB0MTsKK0JFR0lOOworU0VMRUNUICogRlJPTSB0MTsKK2EJYgorMwlhCiszCWIK
KzEJYworMAlkCisxCWUKK1NFVCBsb2NrX3dhaXRfdGltZW91dD0xOworQ1JFQVRFIElOREVYIHQx
YSBPTiB0MShhKTsKK0VSUk9SIEhZMDAwOiBMb2NrIHdhaXQgdGltZW91dCBleGNlZWRlZDsgdHJ5
IHJlc3RhcnRpbmcgdHJhbnNhY3Rpb24KK0NSRUFURSBJTkRFWCB0MmEgT04gdDIoYSk7CitTRUxF
Q1QgKiBGUk9NIHQyOworYQliCiszCWEKKzMJYgorMQljCiswCWQKKzEJZQorU0VMRUNUICogRlJP
TSB0MiBGT1JDRSBJTkRFWCh0MmEpIE9SREVSIEJZIGE7CitFUlJPUiBIWTAwMDogVGFibGUgZGVm
aW5pdGlvbiBoYXMgY2hhbmdlZCwgcGxlYXNlIHJldHJ5IHRyYW5zYWN0aW9uCitTRUxFQ1QgKiBG
Uk9NIHQyOworYQliCiszCWEKKzMJYgorMQljCiswCWQKKzEJZQorQ09NTUlUOworU0VMRUNUICog
RlJPTSB0MiBGT1JDRSBJTkRFWCh0MmEpIE9SREVSIEJZIGE7CithCWIKKzAJZAorMQljCisxCWUK
KzMJYQorMwliCitEUk9QIFRBQkxFIHQxLHQyOwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRl
c3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3Vp
dGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QJcmV2aWQ6aW5hYW0ucmFuYUBvcmFjbGUuY29t
LTIwMTEwNjIwMDQzNzM2LXg1cGNheHVpdWx2cW15dm0KKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvdC9pbm5vZGItaW5kZXgudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDYyMjA4MjAxOS01YjR5bDlhOWljc3p1ejZjCkBAIC01MTYsMzQgKzUxNiwzNCBAQCBTSE9X
IENSRUFURSBUQUJMRSB0MjsKIERST1AgVEFCTEUgdDI7CiBEUk9QIFRBQkxFIHQxOwogCi0jIFRo
ZSBmb2xsb3dpbmcgdGVzdHMgYXJlIGRpc2FibGVkIGJlY2F1c2Ugb2YgdGhlIGludHJvZHVjZWQg
dGltZW91dHMgZm9yCi0jIG1ldGFkYXRhIGxvY2tzIGF0IHRoZSBNeVNRTCBsZXZlbCBhcyBwYXJ0
IG9mIHRoZSBmaXggZm9yCi0jIEJ1ZyM0NTIyNSBMb2NraW5nOiBoYW5nIGlmIGRyb3AgdGFibGUg
d2l0aCBubyB0aW1lb3V0Ci0jIFRoZSBmb2xsb3dpbmcgQ1JFQVRFIElOREVYIHQxYSBPTiB0MShh
KTsgY2F1c2VzIGEgbG9jayB3YWl0IHRpbWVvdXQKLSMgc3RhcnQgZGlzYWJsZWQ0NTIyNV8yCi0j
Y29ubmVjdCAoYSxsb2NhbGhvc3Qscm9vdCwsKTsKLSNjb25uZWN0IChiLGxvY2FsaG9zdCxyb290
LCwpOwotI2Nvbm5lY3Rpb24gYTsKLSNDUkVBVEUgVEFCTEUgdDEgKGEgSU5ULCBiIENIQVIoMSkp
IEVOR0lORT1Jbm5vREI7Ci0jSU5TRVJUIElOVE8gdDEgVkFMVUVTICgzLCdhJyksKDMsJ2InKSwo
MSwnYycpLCgwLCdkJyksKDEsJ2UnKTsKLSNjb25uZWN0aW9uIGI7Ci0jQkVHSU47Ci0jU0VMRUNU
ICogRlJPTSB0MTsKLSNjb25uZWN0aW9uIGE7Ci0jQ1JFQVRFIElOREVYIHQxYSBPTiB0MShhKTsK
LSNjb25uZWN0aW9uIGI7Ci0jU0VMRUNUICogRlJPTSB0MTsKLSMtLWVycm9yIEVSX1RBQkxFX0RF
Rl9DSEFOR0VECi0jU0VMRUNUICogRlJPTSB0MSBGT1JDRSBJTkRFWCh0MWEpIE9SREVSIEJZIGE7
Ci0jU0VMRUNUICogRlJPTSB0MTsKLSNDT01NSVQ7Ci0jU0VMRUNUICogRlJPTSB0MSBGT1JDRSBJ
TkRFWCh0MWEpIE9SREVSIEJZIGE7Ci0jY29ubmVjdGlvbiBkZWZhdWx0OwotI2Rpc2Nvbm5lY3Qg
YTsKLSNkaXNjb25uZWN0IGI7Ci0jCi0jRFJPUCBUQUJMRSB0MTsKLSMgZW5kIGRpc2FibGVkNDUy
MjVfMgorY29ubmVjdCAoYSxsb2NhbGhvc3Qscm9vdCwsKTsKK2Nvbm5lY3QgKGIsbG9jYWxob3N0
LHJvb3QsLCk7Citjb25uZWN0aW9uIGE7CitDUkVBVEUgVEFCTEUgdDEgKGEgSU5ULCBiIENIQVIo
MSkpIEVOR0lORT1Jbm5vREI7CitJTlNFUlQgSU5UTyB0MSBWQUxVRVMgKDMsJ2EnKSwoMywnYicp
LCgxLCdjJyksKDAsJ2QnKSwoMSwnZScpOworQ1JFQVRFIFRBQkxFIHQyIFNFTEVDVCAqIEZST00g
dDE7Citjb25uZWN0aW9uIGI7CitCRUdJTjsKKyMgVGhpcyBhY3F1aXJlcyBhIE1ETCBsb2NrIG9u
IHQxIHVudGlsIGNvbW1pdC4KK1NFTEVDVCAqIEZST00gdDE7Citjb25uZWN0aW9uIGE7CisjIFRo
aXMgdGltZXMgb3V0IGJlZm9yZSBvZiB0aGUgTURMIGxvY2sgaGVsZCBieSBjb25uZWN0aW9uIGIu
CitTRVQgbG9ja193YWl0X3RpbWVvdXQ9MTsKKy0tZXJyb3IgRVJfTE9DS19XQUlUX1RJTUVPVVQK
K0NSRUFURSBJTkRFWCB0MWEgT04gdDEoYSk7CitDUkVBVEUgSU5ERVggdDJhIE9OIHQyKGEpOwor
Y29ubmVjdGlvbiBiOworU0VMRUNUICogRlJPTSB0MjsKKy0tZXJyb3IgRVJfVEFCTEVfREVGX0NI
QU5HRUQKK1NFTEVDVCAqIEZST00gdDIgRk9SQ0UgSU5ERVgodDJhKSBPUkRFUiBCWSBhOworU0VM
RUNUICogRlJPTSB0MjsKK0NPTU1JVDsKK1NFTEVDVCAqIEZST00gdDIgRk9SQ0UgSU5ERVgodDJh
KSBPUkRFUiBCWSBhOworY29ubmVjdGlvbiBkZWZhdWx0OworZGlzY29ubmVjdCBhOworZGlzY29u
bmVjdCBiOworCitEUk9QIFRBQkxFIHQxLHQyOwogCiAjCiAjIHJlc3RvcmUgZW52aXJvbm1lbnQg
dG8gdGhlIHN0YXRlIGl0IHdhcyBiZWZvcmUgdGhpcyB0ZXN0IGV4ZWN1dGlvbgoK

--===============0068278073==
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/mysql-5.5/
# testament_sha1: ba39265ffce9a55a10ea490f5cefc650a2cf7427
# timestamp: 2011-06-22 11:44:16 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/
# base_revision_id: inaam.rana@stripped\
#   x5pcaxuiulvqmyvm
# 
# Begin bundle
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
AIsYBNqKjQAr25gs0mQD/F9v8XckU4UJDtV2uHA=


--===============0068278073==--