From: marko.makela
Date: January 27 2011 8:12am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3294)
List-Archive: http://lists.mysql.com/commits/129720
Message-Id: <201101270812.p0R8CQGb011262@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1205178133=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNjA4MDI1Mi12bHAx
NzNoajk4eDFvcmVrCgogMzI5NCBNYXJrbyBNw6RrZWzDpAkyMDExLTAxLTI3CiAgICAgIGlidWZf
Y29udHJhY3RfZXh0KCk6IFJlbW92ZSBhbiAjaWYgMCBzZWN0aW9uIG9mIGNvZGUKICAgICAgdGhh
dCByZWZlcnMgdG8gdHJ4X3N5c19zZXRfaWJ1Zl9mb3JtYXQoKS4KICAgICAgQ2hhbmdlIGJ1ZmZl
ciBmb3JtYXQgdGFnZ2luZyB3YXMgbmV2ZXIgaW1wbGVtZW50ZWQuCgogICAgbW9kaWZpZWQ6CiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vYmFzZS9pYnVmL2lidWYwaWJ1Zi5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L2lidWYvaWJ1ZjBpYnVmLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMjYw
ODAyNTItdmxwMTczaGo5OHgxb3JlaworKysgYi9zdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBp
YnVmLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMjcwODEyMDAteGliNHNv
aW9ibncwd2YxcQpAQCAtMjU4NSwyMyArMjU4NSw2IEBAIGlidWZfY29udHJhY3RfZXh0KAogCiAJ
aWYgKFVOSVZfVU5MSUtFTFkoaWJ1Zi0+ZW1wdHkpCiAJICAgICYmIFVOSVZfTElLRUxZKCFzcnZf
c2h1dGRvd25fc3RhdGUpKSB7Ci1pYnVmX2lzX2VtcHR5OgotCi0jaWYgMCAvKiBUT0RPICovCi0J
CWlmIChzcnZfc2h1dGRvd25fc3RhdGUpIHsKLQkJCS8qIElmIHRoZSBpbnNlcnQgYnVmZmVyIGJl
Y29tZXMgZW1wdHkgZHVyaW5nCi0JCQlzaHV0ZG93biwgbm90ZSBpdCBpbiB0aGUgc3lzdGVtIHRh
Ymxlc3BhY2UuICovCi0KLQkJCXRyeF9zeXNfc2V0X2lidWZfZm9ybWF0KFRSWF9TWVNfSUJVRl9F
TVBUWSk7Ci0JCX0KLQotCQkvKiBUTyBETzogY2FsbCB0cnhfc3lzX3NldF9pYnVmX2Zvcm1hdCgp
IGF0IHN0YXJ0dXAKLQkJYW5kIHdoZW5ldmVyIGlidWZfdXNlIGlzIGNoYW5nZWQgdG8gYWxsb3cg
YnVmZmVyZWQKLQkJZGVsZXRlLW1hcmtpbmcgb3IgZGVsZXRpbmcuICBOZXZlciBkb3duZ3JhZGUg
dGhlCi0JCXN0YW1wZWQgZm9ybWF0IGV4Y2VwdCB3aGVuIHRoZSBpbnNlcnQgYnVmZmVyIGJlY29t
ZXMKLQkJZW1wdHkuICovCi0jZW5kaWYKLQogCQlyZXR1cm4oMCk7CiAJfQogCkBAIC0yNjMxLDcg
KzI2MTQsNyBAQCBpYnVmX2lzX2VtcHR5OgogCQltdHJfY29tbWl0KCZtdHIpOwogCQlidHJfcGN1
cl9jbG9zZSgmcGN1cik7CiAKLQkJZ290byBpYnVmX2lzX2VtcHR5OworCQlyZXR1cm4oMCk7CiAJ
fQogCiAJc3VtX3NpemVzID0gaWJ1Zl9nZXRfbWVyZ2VfcGFnZV9ub3MoVFJVRSwgYnRyX3BjdXJf
Z2V0X3JlYygmcGN1ciksCgo=

--===============1205178133==
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: 7ea82954b39405551f2f96289a2df45891c3b23e
# timestamp: 2011-01-27 10:12:09 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   vlp173hj98x1orek
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ5pvC4AAZBflAAwWmP//1sC
EAC////wBAAIAFADjvB6KHIGnDRI0NR6h6mmnkIBoyAGgAAwAAAAAAAAAADJJtCam1ATeqeo0wBN
BkZDEwCKehTCM0NT0TEZGTIMjEMmRowkkJpoNExDQTKY00GiJ5R6janigzXHM466eYkdEJrr160F
mChgS8byEauSrq3GZlsTvLsmGQ5YxESGMX8ngcGR8X5DajBBiuiDRCBoZ87HgOvtT0UAgrrwUSZf
DVyK4r/BH9LioqVXl79NrKwXJqGtW9I37EjTjOyLwOOVYnzSDNUJHuZZKBtO167XLeKHbUyZPrao
th0WOpfItAuymlBy/H7N2MRGL4PWQmwZBJo4Z6y2ek1QXqR+Lpeys2FC6eMStleZaZfS2io7FCkW
nqEO07ilMPZkw4cKVmzAcRqUb2DP2b2Rar1NMWUNulBZGO4XFki3zaLKSwSi0QOBNSilT6B8yly2
QsNs9ajd04BfOWWSqMdRjRcjAoDKlr9Twbi6Y0pYFayIYYRYuUZFLtE7Ys0QG6r05blLVJWMSm9O
LmMSsrgprNMLe8lRVosjHSrLblZMiamoWlv9Uxy6lnSRblamgWBFqgPYUeiiAD4JEx+hP48pipnt
Ri6/O5ZpFNjDM39s6COEzfczFE2D9floHPI2FAZLIhvSPvd4d4Kc3BPWkd2h+NF+daPipI82oYOX
cqbRZHNtvccgf/AoRSNHj+EMWKsk5uPeoPe5MnJ7ce/68N08WZIumkX/UOCw4ccu07XYE7lpqTnq
s0mebVW9E63AyYsgW/B93UkC4oYhkgqzJbUaFKAzzthaGX8TzDofqwGVdyg5+yBYAKP7EL8xIJqJ
5ZGpw4VB9UZgUREmCWklpheItXgzzr4dSzxTWET55+OTGLeI+tuYu6ZmH1nLyVqvgaNvoL7V6Y9q
8Y4eb01f31GwHms7gw1y/e26j8Cq2ByDsdz9Fw0pty4pHzmGwFAKgqckuEkhjnVo7L1KWCR+UjIP
c4jO16EWyhcaq4UUFDmhFg3wgD3uH7b0/XUKl7ky/QuHDeyRAVOc/W7aKAKKOjonh8JFgeqmjg9Y
azers2ZPINHVCpGttZmykCsQDxsMKkdacSiGNwBeRVFsnBWgIXXqOdbo1RS2jKwaS57hSIootDy6
nb4vgWzc+yBs01Y4zLabArRBPoetE9GsFhtpVeidaqRknCt8heiqoFEHKrC8h/wn3mLuSKcKEhPN
N4XA


--===============1205178133==--