From: marko.makela
Date: May 18 2011 12:12pm
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3379 to 3380) Bug#59641
 Bug#11766513
List-Archive: http://lists.mysql.com/commits/137530
X-Bug: 59641,11766513
Message-Id: <201105181212.p4ICCVo5031502@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1407618508=="

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

IDMzODAgTWFya28gTcOka2Vsw6QJMjAxMS0wNS0xOAogICAgICBGaXggYSBib2d1cyBVTklWX1NZ
TkNfREVCVUcgZmFpbHVyZSBpbiB0aGUgZml4IG9mIEJ1ZyAjNTk2NDEKICAgICAgb3IgT3JhY2xl
IEJ1ZyAjMTE3NjY1MTMuCiAgICAgIAogICAgICB0cnhfdW5kb19mcmVlX3ByZXBhcmVkKCk6IERv
IG5vdCBhY3F1aXJlIG9yIHJlbGVhc2UgdHJ4LT5yc2VnLT5tdXRleC4KICAgICAgVGhpcyBjb2Rl
IGlzIGludm9rZWQgaW4gdGhlIHNpbmdsZS10aHJlYWRlZCBwYXJ0IG9mIHNodXRkb3duLCB0aGVy
ZWZvcmUKICAgICAgYSBtdXRleCBpcyBub3QgbmVlZGVkLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL3RyeC90cngwdW5kby5jCiAzMzc5IE1hcmtvIE3DpGtlbMOkCTIwMTEt
MDUtMTcKICAgICAgQnVnIzEyNTQzNzA2IC0gaW5ub2RiLWZhc3Qtc2h1dGRvd249MjogQXNzZXJ0
CiAgICAgIG5vZGUtPm1vZGlmaWNhdGlvbl9jb3VudGVyID09IG5vZGUtPmZsdXNoX2NvdW50ZXIK
ICAgICAgCiAgICAgIFRoaXMgYnVnIChhbiBhc3NlcnRpb24gZmFpbHVyZSBkdXJpbmcgYSBjcmFz
aC1saWtlIHNodXRkb3duKQogICAgICB3YXMgaW50cm9kdWNlZCBieSB0aGUgZml4IG9mCiAgICAg
IEJ1ZyMxMjMyMzY0MyBDbGVhbiB1cCB0aGUgSW5ub0RCIHRocmVhZCBzaHV0ZG93biBhbmQgYXNz
ZXJ0aW9ucyAoV0wjNTEzNikuCiAgICAgIAogICAgICBmaWxfbm9kZV9jbG9zZV9maWxlKCk6IFJl
bGF4IHRoZSBmYWlsaW5nIGFzc2VydGlvbgogICAgICB3aGVuIGlubm9kYl9mYXN0X3NodXRkb3du
PTIuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZmlsL2ZpbDBmaWwuYwo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHVuZG8uYycKLS0tIGEv
c3RvcmFnZS9pbm5vYmFzZS90cngvdHJ4MHVuZG8uYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDExMDUxNzEyMTU1NS1sbXBsZTI0cXp4cWt6ZXA0CisrKyBiL3N0b3JhZ2UvaW5ub2Jh
c2UvdHJ4L3RyeDB1bmRvLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1MTgx
MjA1MDgtcWhuN3Z6ODE0dm43N3Y1awpAQCAtMTk4NSw4ICsxOTg1LDYgQEAgdHJ4X3VuZG9fZnJl
ZV9wcmVwYXJlZCgKIC8qPT09PT09PT09PT09PT09PT09PSovCiAJdHJ4X3QqCXRyeCkJLyohPCBp
bi9vdXQ6IFBSRVBBUkVEIHRyYW5zYWN0aW9uICovCiB7Ci0JbXV0ZXhfZW50ZXIoJnRyeC0+cnNl
Zy0+bXV0ZXgpOwotCiAJdXRfYWQoc3J2X3NodXRkb3duX3N0YXRlID09IFNSVl9TSFVURE9XTl9F
WElUX1RIUkVBRFMpOwogCiAJaWYgKHRyeC0+dXBkYXRlX3VuZG8pIHsKQEAgLTIwMDEsNiArMTk5
OSw1IEBAIHRyeF91bmRvX2ZyZWVfcHJlcGFyZWQoCiAJCQkgICAgICAgdHJ4LT5pbnNlcnRfdW5k
byk7CiAJCXRyeF91bmRvX21lbV9mcmVlKHRyeC0+aW5zZXJ0X3VuZG8pOwogCX0KLQltdXRleF9l
eGl0KCZ0cngtPnJzZWctPm11dGV4KTsKIH0KICNlbmRpZiAvKiAhVU5JVl9IT1RCQUNLVVAgKi8K
Cg==

--===============1407618508==
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.5-innodb/
# testament_sha1: 0fb48f1ee7e21ee8557ca64d102404504ed5239e
# timestamp: 2011-05-18 15:12:27 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   lmple24qzxqkzep4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcc22PMAAa3flAAQWmf/91+j
jyC/7//wBAAIAFAD3PB6FzABp4aQmSaYgA9TJoANNADQGjT1AOaYmAjTAjCMAAAATCMBokn6TEZQ
J6aAEYjRkwExMARiKb0o1MmnpMmh6QAABoAeoNAASSE0ACYmhkJppGmSeiPUGQ2kemoikJkvAlxw
xkKKD2PlIsNEtIgMPGNxHFBIhCGmcSmbSpR2kNmAB9h5XVzd/amHK8Vn51NDgdnVXn0uGl9LoBKb
BZHc/DMowuf4A5g7RykK39PdVYvQR/a7dVzpnU2XiH2gLTLumykl0UUjByRjjXTF6WbXlFNbxGai
7s4kYQEyCMqePtFB1GM49hlzknf4rrirSZiLNynmSJcPQ2vlEcKJfGMsV3mIveD5M8crar6818z7
22C3rcdPzVao+LhVd7J0CtkUbrY7ahxqIzmFIMqmxQ8hRc4oLAtZzzkHiASmdmheDlTBEggUFviF
hJioSLJyNU1nK1oQkc83uGrlJiiJsMVvMdHWqIttKvuFayCMLGWUy4BTKGJrKhyeUeosHZUF9g8s
ki/KBDF9FM3FXXKvbO5UkCmwgp7qZUytCVR6aqNG7tFPbBOqrHJSClorV4FCeL2Fb0khkbBsLYXW
4hxG2KjbcpkwVZAwO0NdSUGmcFTxmkpCSIIojjNAwCNh+haBPjqiw6tCLuKSEUitEQU8YjDkHx2Y
forG4QnbQpjR6FG+iaeZnC5TWYh1laErr+gJAiJbmS2IyIHk27gCebCY6iQNWEkeeOMltQvvKkOq
ctPkvGrE+K8MOvnohiadNtWi8qakUqT8bc8mYFbWkWvwRdu8qp6FeVyp8F2fFYuwrrb5reThrRNr
zOjr2dhBCw0revo9zFh0536lzpZgdZZZJj9JJGjy1hlne3PZJlGmjtbj6OIJErMfumWaa52WNWuu
8mCKHak6qtOZ018+3cnnOw+/WY31OJ/JqPcSUIlu6G0MSdvX8CdCwxpgZlPfcmhmZK55guIVVzfb
bskliGWrzkGvrbL39Tgxkmdo7FI9cw3AtFwCkKXJKjl4OSHdq1dJVnnoqIxvSPgkcA+p1GdxwVb5
zhPCBStffKvaU5C5icRniGwHwebIJ3GQwQ9kwcun16pyQ0umM543QBUB4RNJf8SOIWBycqjDxt0w
VDaOZM8iyny6xzF5rHyU/Bql7OSW9qd2suU170XW5wJL4gqVtey6i1rIgZPeUWJF2XzGJXhoCmlO
0LINlDrERzh8FUOKzsZWzUUUnGkKgevBTsd2U0Vhs/Q+G75LOZWYeGnYeQrFoHYJ2cBNfI1IOYO5
OTk7cLfJ7k0cFh/xf+vAu5IpwoSGObbHmA==


--===============1407618508==--