From: marko.makela
Date: June 22 2011 8:44am
Subject: bzr commit into mysql-trunk branch (marko.makela:3227)
List-Archive: http://lists.mysql.com/commits/139659
Message-Id: <201106220844.p5M8ilpP002683@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0373334309=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC10cnVuay8g
YmFzZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MjIwODMyNDEtcWFu
dmZuZWFpMTB0anZrZgoKIDMyMjcgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0yMiBbbWVyZ2VdCiAg
ICAgIE1lcmdlIG15c3FsLTUuNSB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAg
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgucmVzdWx0CiAgICAgIG15c3Fs
LXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LnRlc3QKPT09IG1vZGlmaWVkIGZpbGUg
J215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiLWluZGV4LnJlc3VsdCcKLS0tIGEvbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgucmVzdWx0CXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTEwNjIyMDgzMjQxLXFhbnZmbmVhaTEwdGp2a2YKKysrIGIvbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgucmVzdWx0CXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTEwNjIyMDg0MDEwLWZkcGlsbzhtOG15czB3dHoKQEAgLTEwODQs
MyArMTA4NCw0MyBAQCB0MglDUkVBVEUgVEFCTEUgYHQyYCAoCiApIEVOR0lORT1Jbm5vREIgREVG
QVVMVCBDSEFSU0VUPWxhdGluMQogRFJPUCBUQUJMRSB0MjsKIERST1AgVEFCTEUgdDE7CitDUkVB
VEUgVEFCTEUgdDEgKGEgSU5ULCBiIENIQVIoMSkpIEVOR0lORT1Jbm5vREI7CitJTlNFUlQgSU5U
TyB0MSBWQUxVRVMgKDMsJ2EnKSwoMywnYicpLCgxLCdjJyksKDAsJ2QnKSwoMSwnZScpOworQ1JF
QVRFIFRBQkxFIHQyIFNFTEVDVCAqIEZST00gdDE7CitCRUdJTjsKK1NFTEVDVCAqIEZST00gdDE7
CithCWIKKzMJYQorMwliCisxCWMKKzAJZAorMQllCitTRVQgbG9ja193YWl0X3RpbWVvdXQ9MTsK
K0NSRUFURSBJTkRFWCB0MWEgT04gdDEoYSk7CitFUlJPUiBIWTAwMDogTG9jayB3YWl0IHRpbWVv
dXQgZXhjZWVkZWQ7IHRyeSByZXN0YXJ0aW5nIHRyYW5zYWN0aW9uCitDUkVBVEUgSU5ERVggdDJh
IE9OIHQyKGEpOworU0VMRUNUICogRlJPTSB0MjsKK2EJYgorMwlhCiszCWIKKzEJYworMAlkCisx
CWUKK1NFTEVDVCAqIEZST00gdDIgRk9SQ0UgSU5ERVgodDJhKSBPUkRFUiBCWSBhOworRVJST1Ig
SFkwMDA6IFRhYmxlIGRlZmluaXRpb24gaGFzIGNoYW5nZWQsIHBsZWFzZSByZXRyeSB0cmFuc2Fj
dGlvbgorU0VMRUNUICogRlJPTSB0MjsKK2EJYgorMwlhCiszCWIKKzEJYworMAlkCisxCWUKK0NP
TU1JVDsKK1NFTEVDVCAqIEZST00gdDIgRk9SQ0UgSU5ERVgodDJhKSBPUkRFUiBCWSBhOworYQli
CiswCWQKKzEJYworMQllCiszCWEKKzMJYgorRFJPUCBUQUJMRSB0MSx0MjsKCj09PSBtb2RpZmll
ZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC50ZXN0JwotLS0g
YS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC50ZXN0CXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjIyMDgzMjQxLXFhbnZmbmVhaTEwdGp2a2YKKysrIGIv
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItaW5kZXgudGVzdAlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDExMDYyMjA4NDAxMC1mZHBpbG84bThteXMwd3R6CkBAIC01MTQs
MzQgKzUxNCwzNCBAQCBTSE9XIENSRUFURSBUQUJMRSB0MjsKIERST1AgVEFCTEUgdDI7CiBEUk9Q
IFRBQkxFIHQxOwogCi0jIFRoZSBmb2xsb3dpbmcgdGVzdHMgYXJlIGRpc2FibGVkIGJlY2F1c2Ug
b2YgdGhlIGludHJvZHVjZWQgdGltZW91dHMgZm9yCi0jIG1ldGFkYXRhIGxvY2tzIGF0IHRoZSBN
eVNRTCBsZXZlbCBhcyBwYXJ0IG9mIHRoZSBmaXggZm9yCi0jIEJ1ZyM0NTIyNSBMb2NraW5nOiBo
YW5nIGlmIGRyb3AgdGFibGUgd2l0aCBubyB0aW1lb3V0Ci0jIFRoZSBmb2xsb3dpbmcgQ1JFQVRF
IElOREVYIHQxYSBPTiB0MShhKTsgY2F1c2VzIGEgbG9jayB3YWl0IHRpbWVvdXQKLSMgc3RhcnQg
ZGlzYWJsZWQ0NTIyNV8yCi0jY29ubmVjdCAoYSxsb2NhbGhvc3Qscm9vdCwsKTsKLSNjb25uZWN0
IChiLGxvY2FsaG9zdCxyb290LCwpOwotI2Nvbm5lY3Rpb24gYTsKLSNDUkVBVEUgVEFCTEUgdDEg
KGEgSU5ULCBiIENIQVIoMSkpIEVOR0lORT1Jbm5vREI7Ci0jSU5TRVJUIElOVE8gdDEgVkFMVUVT
ICgzLCdhJyksKDMsJ2InKSwoMSwnYycpLCgwLCdkJyksKDEsJ2UnKTsKLSNjb25uZWN0aW9uIGI7
Ci0jQkVHSU47Ci0jU0VMRUNUICogRlJPTSB0MTsKLSNjb25uZWN0aW9uIGE7Ci0jQ1JFQVRFIElO
REVYIHQxYSBPTiB0MShhKTsKLSNjb25uZWN0aW9uIGI7Ci0jU0VMRUNUICogRlJPTSB0MTsKLSMt
LWVycm9yIEVSX1RBQkxFX0RFRl9DSEFOR0VECi0jU0VMRUNUICogRlJPTSB0MSBGT1JDRSBJTkRF
WCh0MWEpIE9SREVSIEJZIGE7Ci0jU0VMRUNUICogRlJPTSB0MTsKLSNDT01NSVQ7Ci0jU0VMRUNU
ICogRlJPTSB0MSBGT1JDRSBJTkRFWCh0MWEpIE9SREVSIEJZIGE7Ci0jY29ubmVjdGlvbiBkZWZh
dWx0OwotI2Rpc2Nvbm5lY3QgYTsKLSNkaXNjb25uZWN0IGI7Ci0jCi0jRFJPUCBUQUJMRSB0MTsK
LSMgZW5kIGRpc2FibGVkNDUyMjVfMgorY29ubmVjdCAoYSxsb2NhbGhvc3Qscm9vdCwsKTsKK2Nv
bm5lY3QgKGIsbG9jYWxob3N0LHJvb3QsLCk7Citjb25uZWN0aW9uIGE7CitDUkVBVEUgVEFCTEUg
dDEgKGEgSU5ULCBiIENIQVIoMSkpIEVOR0lORT1Jbm5vREI7CitJTlNFUlQgSU5UTyB0MSBWQUxV
RVMgKDMsJ2EnKSwoMywnYicpLCgxLCdjJyksKDAsJ2QnKSwoMSwnZScpOworQ1JFQVRFIFRBQkxF
IHQyIFNFTEVDVCAqIEZST00gdDE7Citjb25uZWN0aW9uIGI7CitCRUdJTjsKKyMgVGhpcyBhY3F1
aXJlcyBhIE1ETCBsb2NrIG9uIHQxIHVudGlsIGNvbW1pdC4KK1NFTEVDVCAqIEZST00gdDE7Citj
b25uZWN0aW9uIGE7CisjIFRoaXMgdGltZXMgb3V0IGJlZm9yZSBvZiB0aGUgTURMIGxvY2sgaGVs
ZCBieSBjb25uZWN0aW9uIGIuCitTRVQgbG9ja193YWl0X3RpbWVvdXQ9MTsKKy0tZXJyb3IgRVJf
TE9DS19XQUlUX1RJTUVPVVQKK0NSRUFURSBJTkRFWCB0MWEgT04gdDEoYSk7CitDUkVBVEUgSU5E
RVggdDJhIE9OIHQyKGEpOworY29ubmVjdGlvbiBiOworU0VMRUNUICogRlJPTSB0MjsKKy0tZXJy
b3IgRVJfVEFCTEVfREVGX0NIQU5HRUQKK1NFTEVDVCAqIEZST00gdDIgRk9SQ0UgSU5ERVgodDJh
KSBPUkRFUiBCWSBhOworU0VMRUNUICogRlJPTSB0MjsKK0NPTU1JVDsKK1NFTEVDVCAqIEZST00g
dDIgRk9SQ0UgSU5ERVgodDJhKSBPUkRFUiBCWSBhOworY29ubmVjdGlvbiBkZWZhdWx0OworZGlz
Y29ubmVjdCBhOworZGlzY29ubmVjdCBiOworCitEUk9QIFRBQkxFIHQxLHQyOwogCiAjCiAjIHJl
c3RvcmUgZW52aXJvbm1lbnQgdG8gdGhlIHN0YXRlIGl0IHdhcyBiZWZvcmUgdGhpcyB0ZXN0IGV4
ZWN1dGlvbgoK

--===============0373334309==
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-trunk/
# testament_sha1: 1117e1c39841975a654be6bf64f61f8af6d496d6
# timestamp: 2011-06-22 11:44:43 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# base_revision_id: marko.makela@stripped\
#   qanvfneai10tjvkf
# 
# Begin bundle
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


--===============0373334309==--