From: marko.makela
Date: May 18 2011 12:05pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3380) Bug#59641
 Bug#11766513
List-Archive: http://lists.mysql.com/commits/137529
X-Bug: 59641,11766513
Message-Id: <201105181205.p4IC5QY2028521@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1595822723=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDUxNzEyMTU1NS1sbXBs
ZTI0cXp4cWt6ZXA0CgogMzM4MCBNYXJrbyBNw6RrZWzDpAkyMDExLTA1LTE4CiAgICAgIEZpeCBh
IGJvZ3VzIFVOSVZfU1lOQ19ERUJVRyBmYWlsdXJlIGluIHRoZSBmaXggb2YgQnVnICM1OTY0MQog
ICAgICBvciBPcmFjbGUgQnVnICMxMTc2NjUxMy4KICAgICAgCiAgICAgIHRyeF91bmRvX2ZyZWVf
cHJlcGFyZWQoKTogRG8gbm90IGFjcXVpcmUgb3IgcmVsZWFzZSB0cngtPnJzZWctPm11dGV4Lgog
ICAgICBUaGlzIGNvZGUgaXMgaW52b2tlZCBpbiB0aGUgc2luZ2xlLXRocmVhZGVkIHBhcnQgb2Yg
c2h1dGRvd24sIHRoZXJlZm9yZQogICAgICBhIG11dGV4IGlzIG5vdCBuZWVkZWQuCgogICAgbW9k
aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB1bmRvLmMKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB1bmRvLmMnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2UvdHJ4L3RyeDB1bmRvLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA1
MTcxMjE1NTUtbG1wbGUyNHF6eHFremVwNAorKysgYi9zdG9yYWdlL2lubm9iYXNlL3RyeC90cngw
dW5kby5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNTE4MTIwNTA4LXFobjd2
ejgxNHZuNzd2NWsKQEAgLTE5ODUsOCArMTk4NSw2IEBAIHRyeF91bmRvX2ZyZWVfcHJlcGFyZWQo
CiAvKj09PT09PT09PT09PT09PT09PT0qLwogCXRyeF90Kgl0cngpCS8qITwgaW4vb3V0OiBQUkVQ
QVJFRCB0cmFuc2FjdGlvbiAqLwogewotCW11dGV4X2VudGVyKCZ0cngtPnJzZWctPm11dGV4KTsK
LQogCXV0X2FkKHNydl9zaHV0ZG93bl9zdGF0ZSA9PSBTUlZfU0hVVERPV05fRVhJVF9USFJFQURT
KTsKIAogCWlmICh0cngtPnVwZGF0ZV91bmRvKSB7CkBAIC0yMDAxLDYgKzE5OTksNSBAQCB0cnhf
dW5kb19mcmVlX3ByZXBhcmVkKAogCQkJICAgICAgIHRyeC0+aW5zZXJ0X3VuZG8pOwogCQl0cnhf
dW5kb19tZW1fZnJlZSh0cngtPmluc2VydF91bmRvKTsKIAl9Ci0JbXV0ZXhfZXhpdCgmdHJ4LT5y
c2VnLT5tdXRleCk7CiB9CiAjZW5kaWYgLyogIVVOSVZfSE9UQkFDS1VQICovCgo=

--===============1595822723==
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:05:19 +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==


--===============1595822723==--