From: marko.makela
Date: January 27 2011 8:20am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3463)
List-Archive: http://lists.mysql.com/commits/129724
Message-Id: <201101270820.p0R8EiqZ004377@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2034889000=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNzA4MTUyNC1waDkx
MGV3d2VtMXUxYXI3CgogMzQ2MyBNYXJrbyBNw6RrZWzDpAkyMDExLTAxLTI3IFttZXJnZV0KICAg
ICAgTWVyZ2UgbXlzcWwtNS41LWlubm9kYiB0byBteXNxbC10cnVuay1pbm5vZGIuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jJwotLS0gYS9zdG9yYWdl
L2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMTAxMjcwODE1MjQtcGg5MTBld3dlbTF1MWFyNworKysgYi9zdG9yYWdlL2lubm9iYXNlL2li
dWYvaWJ1ZjBpYnVmLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMjcwODE5
MDYtN2hjZHFmYXZndXo3MXNwcQpAQCAtMjU4NSwyMyArMjU4NSw2IEBAIGlidWZfY29udHJhY3Rf
ZXh0KAogCiAJaWYgKFVOSVZfVU5MSUtFTFkoaWJ1Zi0+ZW1wdHkpCiAJICAgICYmIFVOSVZfTElL
RUxZKCFzcnZfc2h1dGRvd25fc3RhdGUpKSB7Ci1pYnVmX2lzX2VtcHR5OgotCi0jaWYgMCAvKiBU
T0RPICovCi0JCWlmIChzcnZfc2h1dGRvd25fc3RhdGUpIHsKLQkJCS8qIElmIHRoZSBpbnNlcnQg
YnVmZmVyIGJlY29tZXMgZW1wdHkgZHVyaW5nCi0JCQlzaHV0ZG93biwgbm90ZSBpdCBpbiB0aGUg
c3lzdGVtIHRhYmxlc3BhY2UuICovCi0KLQkJCXRyeF9zeXNfc2V0X2lidWZfZm9ybWF0KFRSWF9T
WVNfSUJVRl9FTVBUWSk7Ci0JCX0KLQotCQkvKiBUTyBETzogY2FsbCB0cnhfc3lzX3NldF9pYnVm
X2Zvcm1hdCgpIGF0IHN0YXJ0dXAKLQkJYW5kIHdoZW5ldmVyIGlidWZfdXNlIGlzIGNoYW5nZWQg
dG8gYWxsb3cgYnVmZmVyZWQKLQkJZGVsZXRlLW1hcmtpbmcgb3IgZGVsZXRpbmcuICBOZXZlciBk
b3duZ3JhZGUgdGhlCi0JCXN0YW1wZWQgZm9ybWF0IGV4Y2VwdCB3aGVuIHRoZSBpbnNlcnQgYnVm
ZmVyIGJlY29tZXMKLQkJZW1wdHkuICovCi0jZW5kaWYKLQogCQlyZXR1cm4oMCk7CiAJfQogCkBA
IC0yNjMxLDcgKzI2MTQsNyBAQCBpYnVmX2lzX2VtcHR5OgogCQltdHJfY29tbWl0KCZtdHIpOwog
CQlidHJfcGN1cl9jbG9zZSgmcGN1cik7CiAKLQkJZ290byBpYnVmX2lzX2VtcHR5OworCQlyZXR1
cm4oMCk7CiAJfQogCiAJc3VtX3NpemVzID0gaWJ1Zl9nZXRfbWVyZ2VfcGFnZV9ub3MoVFJVRSwg
YnRyX3BjdXJfZ2V0X3JlYygmcGN1ciksCgo=

--===============2034889000==
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.6-innodb/
# testament_sha1: 9f6a5b7cdf715e6c3c9d03b0925b4c24e6acccb7
# timestamp: 2011-01-27 10:20:12 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   ph910ewwem1u1ar7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZbEeqMAAzTflAAwWmP//1sC
EAC////wBAAIAFAFuV5V2a1bayU6V056scJUymk00BoaaYgAGgGQAASUmkzJlGyU8pp6j1DQAZAA
DIJFNEIwk2SnjVNP0UZMg00PUGgAbVUzTSGmIBoaZAAAAAAkkieTIJpgJoCk9lTeinqZNNPUHppG
7sXmcGfPuPoG44eawHnGM92AXuxkmlKsrnMlOqCOHt6UyMDMYxo99PFH3oUrJX8tkoHO6G4HFFV1
fpdMlksIUdvgk7Xrh4hpOFxArqoUUnucluIICoaEt/uQQNLs3CoGw2z49xrqF5ALEXlyF6BWCkUn
pWz7vY6LtzKnK0R2aIzR3C5iF0u4oFhoZmG2hznTCkwFxnYImtSODKZkC4CegXsa6qcrNcCmKO2l
FohamKma1jQ0RVSVhaUR4Cx4C/7H3EXasF0nCtd5DFQkd+p0DnmXKCSJZmrEqisoK8Qze1JpAy0l
XGW/WZmwOozMYmLoVfhaaiIZshx6itwGvV1+vDuiKLgkMEz9Wk3rH42fhbxG8XNT0R5KasQ8s+QC
mOHI4s+2Kkp0V0OZMTDgRNsgW6DpiDyImK8XJcj7jH3EaECFpJnUWGDldSFkS2Q3SvUcRbCDEr0r
vFqV7ncN9dYQjPBQC4Y3UW1k5JZDc5YwHD5x7g2AxDMWmi7A0PETyHWkZqKsZCnlbsoC4ky5qZOn
PWYYCqK0R0Hvr3ITFznpQbFzbs6hVxhAKh5lNtGssrjeNFaU57idbAcKt5MfCJAqhOkcx7CVDUIZ
tFyLLhUKassoXnVea44Cxi3B2ULtxWKSnVtgkb8xRHvFapxTOEWLBwjYaGY0SZFRRWZ3TltEKFtZ
JVijAUjWnF9tEZWCxYpG1QuCyJZsdE0AUscWjrDgMRgQQricHjhMUDbAilREYiKX2DefEyOAXEjx
hv0nYdpgLcIVdrY0Nv8uUxHNXrTBtULxpdNHMO/I4lAHkLIvJUOu1gKY7tUa3njySFPaOStyQLvC
ROYPV2y1UiPckgXqz2FkLDs3cTSRtEZzHdv0OHYclMfYROQBF/g5iGFwtZby1qfdLqv7xWT0pVMU
hTFR6qbheHL2ci7JhhCvuELA+J6Fj1JXtjzM3XFh867UZVCcR1gKxamhq4sHWW+gtaYNTgwuoUCr
Hw+vr8xmBKaedsFotuOq6o2MeikmNA+NJkRFrlZjIzNWxQvyjj8MnUg8vwcdh/jmMnkjHRxxPYcF
KQvCy+JBv5CcLV3Hjoem9/U6kgnliwGi/WQnkOPg5sG0TAnXjDNLLudNrXjCMbkgGYH4mC2Qpnsm
NxeQiQ2g5VSPzEefQVpyTcgPxz1FVirUX7FgWfQR8CuEwfQlhVeeI0TCw28wcSTQxH9qU8Xh9ZFR
mOkQ/EDiB3HHn9V69MUmOC+SBe5olvSF3NgFIFI5AHQiITB5SuOxncokTABQmmUx/CBZB/R1GkAy
Q5ZmKWosmbA4msnQoFNCJUrYERMkSSgiRGBsSgOAakiuJCYugjnzNBoFMQ+lJDziuoTEgaJcE401
+UIgDoQhM6itbJSKQYxQEzepV79oqi0mNtjqa/DI7xVHEzYWuE7iER0AnlVV0ahfY1hTyVNY2gh8
K8DI00eYAwn6Te9o8l+1dOLhmHHIBiIYMNzEZCqKQoAhYHr1HHR8xOG20cTVk4cTKJhgVhVApSkB
OK+d84ryzcr9EIw5FCVV3oLPdWKq4TAWpzREvZViKl6KLhDUqBR1GQoXqo3BifB/i7kinChIS2I9
UYA=


--===============2034889000==--