From: marko.makela
Date: January 27 2011 8:15am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3462)
List-Archive: http://lists.mysql.com/commits/129722
Message-Id: <201101270815.p0R5cLaM005966@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0569656359=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNjA4MTAyOC12M3J1
YmxmOWU5ZHRlZG0wCgogMzQ2MiBNYXJrbyBNw6RrZWzDpAkyMDExLTAxLTI3CiAgICAgIGxvY2tf
dW5sb2NrX3RhYmxlX2F1dG9pbmMoKTogUmVsYXggYSBkZWJ1ZyBhc3NlcnRpb24gdGhhdCB3YXMg
YWRkZWQgaW4KICAgICAgYnpyIHJldmlzaW9uLWlkIG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTEwMTI1MTEyNzA1LWMxNnNtcWx5djJhempwYXUuCiAgICAgIFRoaXMgZnVuY3Rpb24gY2FuIGJl
IGNhbGxlZCBmb3IgWEEgUFJFUEFSRUQgdHJhbnNhY3Rpb25zLCBhZnRlciBhbGwuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2suYwo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jJwotLS0gYS9zdG9yYWdl
L2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMTAxMjYwODEwMjgtdjNydWJsZjllOWR0ZWRtMAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2xv
Y2svbG9jazBsb2NrLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMjcwODE1
MjQtcGg5MTBld3dlbTF1MWFyNwpAQCAtNjEyMSw4ICs2MTIxLDEwIEBAIGxvY2tfdW5sb2NrX3Rh
YmxlX2F1dG9pbmMoCiAJdXRfYWQoIWxvY2tfbXV0ZXhfb3duKCkpOwogCXV0X2FkKCF0cnhfbXV0
ZXhfb3duKHRyeCkpOwogCXV0X2FkKCF0cngtPmxvY2sud2FpdF9sb2NrKTsKKwkvKiBUaGlzIGNh
biBiZSBpbnZva2VkIG9uIE5PVF9TVEFSVEVELCBBQ1RJVkUsIFBSRVBBUkVELAorCWJ1dCBub3Qg
Q09NTUlUVEVEIHRyYW5zYWN0aW9ucy4gKi8KIAl1dF9hZCh0cnhfc3RhdGVfZXEodHJ4LCBUUlhf
U1RBVEVfTk9UX1NUQVJURUQpCi0JICAgICAgfHwgdHJ4X3N0YXRlX2VxKHRyeCwgVFJYX1NUQVRF
X0FDVElWRSkpOworCSAgICAgIHx8ICF0cnhfc3RhdGVfZXEodHJ4LCBUUlhfU1RBVEVfQ09NTUlU
VEVEX0lOX01FTU9SWSkpOwogCiAJLyogVGhpcyBmdW5jdGlvbiBpcyBpbnZva2VkIGZvciBhIHJ1
bm5pbmcgdHJhbnNhY3Rpb24gYnkgdGhlCiAJdGhyZWFkIHRoYXQgaXMgc2VydmluZyB0aGUgdHJh
bnNhY3Rpb24uIFRoZXJlZm9yZSBpdCBpcyBub3QKCg==

--===============0569656359==
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: 5a2067683e4ef59524f823201e1564ba1d10819f
# timestamp: 2011-01-27 10:15:33 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   v3rublf9e9dtedm0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ2ZMd0AAbZflBAwcnf//38j
3WC////0BAAIAFAD9GUxLPbGdTrhJQhNPU0aDTI0CMm1GSbCTRo9QyNPUxqeoGSJkyYIE1HkJA0y
DBMIPUPUANAEkRNNVPwQniKfqah5QPUeo0yA0DQBmkaDjJk00wmRkDAjE0YIwg0aYABBJJU9MJqZ
tU9T1Mh7U9U0NAAA0AAABazS2N2y7RW/szDXPGvBMt8yBW1i160Uq03/yt+qeiIhk+yycYYy7C4l
ZFCN54I779MGdmbjy9YHecZ5Mh+7vL0/sLiBmC217mMCvvIck9JJPS7YDWBAh0Xts8+6rXFaPCmf
0XqkftdqmLSnJ9fHwFliXvZxQvwrMC9usFp2dGG7LG5LWzTuBeBRBYsuSoy0qHEpKgVJTeDLLHXr
HaM2FzrtrQK1m3UJHnzqXGb+XMK5IvLqJRUEMhqhxVYvfdqgVC+p72KC6lJwVgmuHfsoKxZYptAq
KRRX8eJInvuHl+YToDVNNQoZZ3Rxb2+KP4RrNbNqastjktJItkalT3VUbTbarUo6GJll0CeFhLEx
kOaVWZqDY0iIgFE1P4gJbXGoZ2EYBRxgtSV2yNdWgmhU+NeRgJTYWvIxEUKADZiLi+41zEIHFoYL
FwXcajiWkCl51WOhfSAlYLaX0ceHlBWcDqUxJiYlI5nmbjaA6io3NRKpGaJJ002kSCmbaFVzmPmz
Ylj7obNvfuWQLhX+jqK7mTHNR1/CCOuXCbMdLj2onEg7nAnvrOrpJcJDBMWhIWVQHeKpo2DYhyrl
qrEN0rMLxrTRAPd6Khu9YlphDoWanVYOnWC517MJXq8d4K4SxdrXQBUC74Ns8jSJdlkUiKngub20
MeyIqm36i0rPcX7+1bpSneR+Kyx8NfzZDF+1lEbKdFJUmyql6yKytNnTXtV3cgcw4E8DgxYgWpf5
J4CLeN5rKLLI4GF1qsjtFC/UX02IhBp+sQ2eu6iuquiGA6Wvax4QEZnt3btZuTseqKst5TWKYrkL
IP40eC3M6xajgmLVLcwt0ZmZsZGi2KJOjVNGBdVZXcYWDAcurRiYq+Vjc7kWZhMmC9W2jwcS3yTS
YEyGcvJw82IBTN5WVSTTj0MZDEiEluIwGemSH6IL30AwIU+ELoOcgIUAmg0jlQVtD8UUxxvw0exe
rSIpxP5AXHSH1Khn7mKzwvMqoxNJQRiMlVCF7hFo5gOrluEpUi4yYMeNCsSJ7+pG1CzaEosSl3zB
TB14XVWbCrBmXYQI4CnhK+RJ8M7pxQANlpBFk9jlO2hCmqYWUEeVUIdSwNBFjKmx2NFdKGpXe6Q6
xGOIXDBUUTuDZBVVhyjcNaMhnIaKQTiBMuCNW7snFX18worPDLQRV9saP2alWtKGz8goClUOmWI6
UYQP5c/8VuH/F3JFOFCQDZkx3Q==


--===============0569656359==--