From: marko.makela
Date: May 25 2010 12:53pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3482) Bug#53627
List-Archive: http://lists.mysql.com/commits/109168
X-Bug: 53627
Message-Id: <201005251254.o4PCrjkG013136@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0618809049=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyNTEyMzc0OC1wbXBl
aGJnMjlveWhjMW5zCgogMzQ4MiBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTI1CiAgICAgIHJvd19z
ZWFyY2hfZm9yX215c3FsKCk6IEFkZCBhc3NlcnRpb25zIHRvIHRyYWNrIGRvd24gQnVnICM1MzYy
Ny4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2Vs
LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5j
JwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBzZWwuYwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyNTEyMzc0OC1wbXBlaGJnMjlveWhjMW5zCisrKyBiL3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwNTI1MTI1MzUyLWhnYWZwbXFocnJqN3B2NWkKQEAgLTM2MTEsNiArMzYxMSwx
MyBAQCBzaG9ydGN1dF9mYWlsc190b29fYmlnX3JlYzoKIAkJdHJ4LT5oYXNfc2VhcmNoX2xhdGNo
ID0gRkFMU0U7CiAJfQogCisJdXRfYWQocHJlYnVpbHQtPnNxbF9zdGF0X3N0YXJ0IHx8IHRyeC0+
Y29uY19zdGF0ZSA9PSBUUlhfQUNUSVZFKTsKKwl1dF9hZCh0cngtPmNvbmNfc3RhdGUgPT0gVFJY
X05PVF9TVEFSVEVECisJICAgICAgfHwgdHJ4LT5jb25jX3N0YXRlID09IFRSWF9BQ1RJVkUpOwor
CXV0X2FkKHByZWJ1aWx0LT5zcWxfc3RhdF9zdGFydAorCSAgICAgIHx8IHByZWJ1aWx0LT5zZWxl
Y3RfbG9ja190eXBlICE9IExPQ0tfTk9ORQorCSAgICAgIHx8IHRyeC0+cmVhZF92aWV3KTsKKwog
CXRyeF9zdGFydF9pZl9ub3Rfc3RhcnRlZCh0cngpOwogCiAJaWYgKHRyeC0+aXNvbGF0aW9uX2xl
dmVsIDw9IFRSWF9JU09fUkVBRF9DT01NSVRURUQKCg==

--===============0618809049==
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: 9e051b2a1c2d1ec96a9e332baa440140b37989f1
# timestamp: 2010-05-25 15:54:06 +0300
# base_revision_id: marko.makela@stripped\
#   pmpehbg29oyhc1ns
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf9GJUsAAZ9flBAwemP//38v
nUC////0BAAIAFADzvABoAAhokJptTQAMnqZAAAAGgANAHGTJkxGJgBMmCZADRhGAIYDjJkyYjEw
AmTBMgBowjAEMBE9U0mTQwJoaGQaGmQAAA0AGmEkhDTSZNTyaZAJomBJptGp6Jk0GnkaNQsSwLtW
rqcMOvsny0QBlTofoPJADzCEPmhEwgJxa9rLkmyAC6Mk4ikFQQROgeSca5NvUwbfzSH06/gSAi9K
HMzScbPxdhhyIcyotU54vtXL185P9V5CP9Xq51+Q0KS7hbn3+Uy3ZYx0LekV7EjVjZKd6iyrZkjM
8RrT3ZitkEy44Qn6hmGUInlspml3LWqzqZUe7npsZB0YcdRF9Lh863a6UFMrZ2nxsLy9fA+9fwV+
rrvrKWVVWh+x6Lxa59Qi6i5lB5jQggLTNzPVeSr09qunDV4N4IpNI2e/hFs7mOG6N4tSaiSiUK4e
2C0kM+mmKuY0RbKQacXFRQXVlWSeTVWtZeoINAnIHC8J8NwYzTp2ZGdfkVdbZihp2eVZ7zRJOVVb
KULleX5Vz8g5FrnIzqZYW11q6HmKVl6iq7E6zThRmaue1iBKN63u0WDlKl2GtzGYwrIL3s65FMp9
DTZ0VvKHJqJnMRCiLVqS95j8favXt0lnY59C5ebavYwciySPM+0abWTHc/x+g/x+5RGpDHNq0aWx
3SG4pLwwpDRNeAuXoQm0otxy1GAjNyYgXAwDGvlx/SgPWu3oVc3Ekkd56W/NkjaqqT2d/7iwoDsS
PlljC2VaPxFInOVw5DeGtd+OR2D1s2LssX9fH9QYqUTI1eBJPqOVcFqUFBcfSGzbtG/tyRakaPJY
VNMssdLcIY5sMbVFNiTKi2g717YfNcxxjF/FdSFb0Vnzf09fTlyknSnC3fzycptWzhbO3NTctcyw
spbdwccyRO2c+iZcccJ62zYlAOmT6FLjkY263rAGHmv1GY/HPwy7XHRsE3TuVooI4LINC+qjw6Re
gndJamVG03F0bk083LuNa0KBhxCunxyuhoCOYOV/RcLEvTG3UkfbSE4LVklIJOB4yRukkMOpz6ZT
KM/WkdSReH0P5GdptVb5GimEDqQVz+6cNrKiAObZyJ2UOhXIgyZb9+5kjTG7IFQDLsc8j5JFIOV7
lXMlx7ljoxZk46GVGCqFVhHnKesVIuK1ZLNyMkuuH6VpyJc1ZTvwFOCkqoU+iOartFEkU0qDA5bn
WzPKm9atlPi4n2g1K2a4lVjTpRRdBuCsfrTuHuIFoDJ1mJGF8qhpohJOaCcbWmgrrLvfsW+hVead
tFNJU4BnTMicMHpyer999pP5h6Caf4Udn8XckU4UJD/RiVLA


--===============0618809049==--