From: marko.makela
Date: February 10 2011 12:19pm
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3316 to 3317) Bug#59877
List-Archive: http://lists.mysql.com/commits/131067
X-Bug: 59877
Message-Id: <201102101619.p1AFwZhd029860@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0985870705=="

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

IDMzMTcgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xMAogICAgICBCdWcgIzU5ODc3IFdyb25nIGJ1
ZmZlciBwb29sIHNlbGVjdGVkIGluIGJ1Zl9yZWFkX2lidWZfbWVyZ2VfcGFnZXMoKQoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwcmVhLmMKIDMzMTYgVmFzaWwg
RGltb3YJMjAxMS0wMi0xMCBbbWVyZ2VdCiAgICAgIE51bGwgbWVyZ2UgbXlzcWwtNS4xLWlubm9k
YiAtPiBteXNxbC01LjUtaW5ub2RiCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFz
ZS9idWYvYnVmMHJlYS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwcmVhLmMJcmV2
aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDIxMDExMzI1MC0yY3pzeHg2MzB6Z204aDA1
CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjByZWEuYwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDExMDIxMDEyMDc1OC1rM3RlNzdldTRzaHFjczNqCkBAIC01MzAsNyArNTMw
LDcgQEAgYnVmX3JlYWRfaWJ1Zl9tZXJnZV9wYWdlcygKIAkJYnVmX3Bvb2xfdCoJYnVmX3Bvb2w7
CiAJCXVsaW50CQl6aXBfc2l6ZSA9IGZpbF9zcGFjZV9nZXRfemlwX3NpemUoc3BhY2VfaWRzW2ld
KTsKIAotCQlidWZfcG9vbCA9IGJ1Zl9wb29sX2dldChzcGFjZV9pZHNbaV0sIHNwYWNlX3ZlcnNp
b25zW2ldKTsKKwkJYnVmX3Bvb2wgPSBidWZfcG9vbF9nZXQoc3BhY2VfaWRzW2ldLCBwYWdlX25v
c1tpXSk7CiAKIAkJd2hpbGUgKGJ1Zl9wb29sLT5uX3BlbmRfcmVhZHMKIAkJICAgICAgID4gYnVm
X3Bvb2wtPmN1cnJfc2l6ZSAvIEJVRl9SRUFEX0FIRUFEX1BFTkRfTElNSVQpIHsKCg==

--===============0985870705==
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: 0eec42e37dad1f895c1b6da9d408f57e6c856010
# timestamp: 2011-02-10 14:19:44 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   2czsxx630zgm8h05
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQIEex8AAYrflAAwWmf//1MC
AIq///9wBAAIAFADfXgAFDQDQigMT1NBpoBo0yGgaeiGgBzAAAAAAAAAABzAAAAAAAAAAA0FJ6ho
0ekGymgAADRoAAJJBDTUxMENAQnlNMUaZB4kzUGcVmV5z8BqeKIc1KgAc5imiP3MjhuGZieYu8DK
t9UNSk+0X4I3Lk9HxovVa0Qw6YZgFL+ZGEEMoniWPKsVpsh0L2ETXqvRUrbLm8WntulGPst6RtWH
FLZlbOl4uc057/BIZaJgCNvaJctae8WI4jJxUwyp+vYoh+y0XVXKhl0psQSkg57Tw7Ugsh8HoJ1O
sL61Zq3r7mXvqjl/Kkfb55vJstlubt3doIsKRZINmWJJRzokn3MF33b7o0tUqi6Zas+WpMUO6lOa
qvT4/IXMUeclFYscrE12cKKi4eaDlHBc8apH6/IseVPEOK2HRb2tH2G8k+CtFfd/WAWRVCpcZRhN
xkW4qnlhs0Wd+UlWpnz01Yd2CeT3JqsRYqZRXAotFQ2V1y+khTkUTeghwTRafQydZOWrQpsWatLW
MlqxdXG5q5jWwok5YNVG6DRka3lLk1LRKgpqaagvt9jM89mZqd5P4dttyz/S0SsrTM3rzfSh1x8z
mV231a2RwYZU+cSCcGKiaSS2fHofRIlS1hlKygKSOxLXr10SpR+KUtqYO/wXgdDEHvtz6afhHTH3
4ry7gY1LQn2XmuS79a09MOWuDMkWJGPwLurTF/dulpNRTPU7x/n5qC4JvLvL1Ip7IW2ipzZp3kBQ
yxwZaxo5osgpQNq12NM2q6bEha9nNlSCciiN8TEy+sKdu3DbHlu4wHSFWFKhvrYZMtzvlrc4qwOm
uoNht3KA5o6yj/fl9ODHiRfSLJvjRZeKbeEqHCqmtxt+DVqajxeDUaElinj1ec0aqffLXCsOgcnd
fQWd6aYs0vziHnmB5nFaBYFjg8ouSjqSGHTv5VQpEW9UkRFzEwOR0ZJFYSuJIUKhAECgSwKQUzbW
MlkptIKwMuXADrRbWtgKkO+HimPZI7wmoOUpYhxxNeTmUCMINVhRhxFm4Kkl17KUUU85lRGIFSu+
IWURimTnbBP6vvjX/FnBie8Vq3g+sm3aZUjLgpQ3Ob1NfYTsZ4HWrLnaVhMHKMHrCwV+zekf3zpq
U9S1KCrCF6cnKhWWHFRwX/F/r/4u5IpwoSAECPY+


--===============0985870705==--