From: marko.makela
Date: June 22 2010 11:52am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3517) Bug#54686
List-Archive: http://lists.mysql.com/commits/111761
X-Bug: 54686
Message-Id: <201006221152.o5MB59hD019963@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1574260889=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMTA5NTE0OC04Zzcz
azhrNjhkcGowODB1CgogMzUxNyBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTIyCiAgICAgIEJ1ZyM1
NDY4NiAiZmllbGQtPmNvbC0+bXR5cGUgPT0gdHlwZSIgYXNzZXJ0aW9uIGVycm9yIGF0IHJvdy9y
b3cwc2VsLmMKICAgICAgaGFfaW5ub2Jhc2U6OmluZGV4X3JlYWQoKSwgaGFfaW5ub2Jhc2U6OnJl
Y29yZHNfaW5fcmFuZ2UoKTogQ2hlY2sgdGhhdAogICAgICB0aGUgaW5kZXggaXMgdXNlYWJsZSBi
ZWZvcmUgaW52b2tpbmcgcm93X3NlbF9jb252ZXJ0X215c3FsX2tleV90b19pbm5vYmFzZSgpLgog
ICAgICAKICAgICAgVGhpcyBmaXggaXMgYmFzZWQgb24gYSBzdWdnZXN0aW9uIGJ5IFlhc3VmdW1p
IEtpbm9zaGl0YS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2hh
bmRsZXIvaGFfaW5ub2RiLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVn
aW4vaGFuZGxlci9oYV9pbm5vZGIuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9oYW5k
bGVyL2hhX2lubm9kYi5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMTA5
NTE0OC04ZzczazhrNjhkcGowODB1CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9oYW5kbGVy
L2hhX2lubm9kYi5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMjExNTIx
NS1reHR6eDd4dXVnY3hkMzc1CkBAIC01Mzc5LDYgKzUzNzksOSBAQCBoYV9pbm5vYmFzZTo6aW5k
ZXhfcmVhZCgKIAkJcHJlYnVpbHQtPmluZGV4X3VzYWJsZSA9IEZBTFNFOwogCQlEQlVHX1JFVFVS
TihIQV9FUlJfQ1JBU0hFRCk7CiAJfQorCWlmIChVTklWX1VOTElLRUxZKCFwcmVidWlsdC0+aW5k
ZXhfdXNhYmxlKSkgeworCQlEQlVHX1JFVFVSTihIQV9FUlJfVEFCTEVfREVGX0NIQU5HRUQpOwor
CX0KIAogCS8qIE5vdGUgdGhhdCBpZiB0aGUgaW5kZXggZm9yIHdoaWNoIHRoZSBzZWFyY2ggdGVt
cGxhdGUgaXMgYnVpbHQgaXMgbm90CiAJbmVjZXNzYXJpbHkgcHJlYnVpbHQtPmluZGV4LCBidXQg
Y2FuIGFsc28gYmUgdGhlIGNsdXN0ZXJlZCBpbmRleCAqLwpAQCAtNzIyMSw2ICs3MjI0LDEwIEBA
IGhhX2lubm9iYXNlOjpyZWNvcmRzX2luX3JhbmdlKAogCQluX3Jvd3MgPSBIQV9QT1NfRVJST1I7
CiAJCWdvdG8gZnVuY19leGl0OwogCX0KKwlpZiAoVU5JVl9VTkxJS0VMWSghcm93X21lcmdlX2lz
X2luZGV4X3VzYWJsZShwcmVidWlsdC0+dHJ4LCBpbmRleCkpKSB7CisJCW5fcm93cyA9IEhBX0VS
Ul9UQUJMRV9ERUZfQ0hBTkdFRDsKKwkJZ290byBmdW5jX2V4aXQ7CisJfQogCiAJaGVhcCA9IG1l
bV9oZWFwX2NyZWF0ZSgyICogKGtleS0+a2V5X3BhcnRzICogc2l6ZW9mKGRmaWVsZF90KQogCQkJ
CSAgICArIHNpemVvZihkdHVwbGVfdCkpKTsKCg==

--===============1574260889==
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.1-innodb/
# testament_sha1: 278d0982bbb75474186b4e4b4037535de7a713ab
# timestamp: 2010-06-22 14:52:30 +0300
# base_revision_id: marko.makela@stripped\
#   8g73k8k68dpj080u
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYJ5yNYAAcNflAAwemf//3/v
FyC////6BAAIAFAEfu73dxVW3j0C9bO8ElBACaNNAaU/Kj08pqepk00ZGR6nkgANAkoJoYQDVEep
oAeo0AAekABoAGRAamU9JkNUeUaZHppH6kMgAGgAADakUYUenpNJoHpNqPKaaAaAAADIAEkpkETT
Yp6g2KG1AyAAANDQeoGgyYYZj8pbQocS0auYbL1YDBWxVp1zCHx33OvRyvgtbuEcm4kRD8uoTfGr
QeiB6UV7v79+rl5my/ltP4ZnhF+kZcPjBrP4RfFq2+nzcSxpyHKclNxPi6s4g1m9iwgUXyM5HuuH
WXU5r9BzvfWZkL2OQlJtXMzyp2y/SRl2IPpaWYvAVWCJItK+6LM9YmCVmES4RGFOumIhUwjGRkXy
slMQkAELqyc2ATzGEy7QGcoROjmuBGed55do0veE10FBmJXWrlzGa/N8hVFzLx6a8thKrU3i22sd
n0BFJuTRZCm4T3s2NjaRdg/a1ZPDj4M4IyH4twMISMC2naN9VmJ6naQHMTJHYzUH1iaTB77h0cr8
tWrja+ZkgwGRcJAPB7FHIMEhiYg2jid1JavU82ecSoyCJ1iSYzbdi2BdN9zkFTCKvn1FAwwT81Sy
3HM0XhOtxcRGJXSISrU0wGYLOsbFK9YuCnQNdllsZ0a2UbdBDIrRZaphEmpKtGkysDXc43363PIN
NGVZpVNs67AGgJKUiyyFAGuS48+jPyDcOl24Y2TN0e3v7PgRTqykRaZQvTMMzZCjyq+iZxkcSehG
ew8+LSQnRwPx9j2YWlhzju8OLzN8tCQUZAeOG63zHlZlCXOSE5lnP0dPVzadvgcbUPiYHCKLtj5O
ggOUJV2PuG+iQLWr14hD0eL6aTlwSHdXtb2d3dHEHWI46a30rQ3VSj9yCJw0/OR7mG+1VqrNJXp1
nvuU+T4KZzl5JDtfi5dSGomI8JOYPAkLh+Wqp53OBZYwWfxxUIZRYmdRZQ9Y0Y7ndPSpEzlAsuoO
CxEKLFeNVywkj3w1l8Ls2eAS17x0w6PZipqJSjDVWb204kRZKLGjWeZ9EBhdhlZtzYNslz5L2R3t
IPARayo8UxZ1ss1WSbo7nTQGyYJUbpVRDEQKzIY7tDrGJ9xGYf3DMWRNOcua9tyb6XCbjzsDQ/je
awom7TGxay7Hw75J5Q2VyGQq6LkzVBlLRymHn3rj8oNKnX44HCn48LY4pJisG9LJecOt+iiqPXuV
FppTNq3LaI/ONHXUCgh2uKCUHC/WBZNxlAE5Vl2FNdtZ0swLiQNZ+Y7wRePUa630Fd1HRgN8JQiS
nDkZnkBDBQo67zgtBfBrwmYYjbDisZCaIKLKREJEZH2z4BSJOlDa5Sz9EaM0+hjE07yG5S1+Pnjv
i1aBNSXNsaMlIoSE33iYjAkSOp08JcllgwE5gIejccUfiMJWLk6bsIpxo6twC3GmytEEwFsqngNt
zl1c4fetWE0ya9qBmuxcEwsXZg5U3SbgLPVR9dRNfuOmpp+JKIqBUGnuMuBpYS7sCgVgmDaF1iuR
Gi0O9WPpgziGAUxjP41u//F3JFOFCQgnnI1g


--===============1574260889==--