From: marko.makela
Date: August 19 2010 10:36am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3168) Bug#56114
List-Archive: http://lists.mysql.com/commits/116225
X-Bug: 56114
Message-Id: <201008191036.o7JAaHFs008516@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2135869267=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDA4MTkwNDE2NDctd3g5dDlq
dHVrZHRiMjNqdgoKIDMxNjggTWFya28gTcOka2Vsw6QJMjAxMC0wOC0xOQogICAgICBCdWcjNTYx
MTQgRGlzYWxsb3cgdHJ4LT5kaWN0X29wZXJhdGlvbl9sb2NrX21vZGU9PVJXX1hfTEFUQ0ggaW4g
c3J2X3N1c3BlbmRfbXlzcWxfdGhyZWFkKCkKICAgICAgCiAgICAgIElzc3VlIGFuIGVycm9yIG1l
c3NhZ2UgdG8gdGhlIGVycm9yIGxvZyB3aGVuCiAgICAgIHRyeC0+ZGljdF9vcGVyYXRpb25fbG9j
a19tb2RlID09IFJXX1hfTEFUQ0ggaW4KICAgICAgc3J2X3N1c3BlbmRfbXlzcWxfdGhyZWFkKCku
IFRyYW5zYWN0aW9ucyB0aGF0IG1vZGlmeSBJbm5vREIKICAgICAgZGF0YSBkaWN0aW9uYXJ5IHRh
YmxlcyBtdXN0IGJlIGZyZWUgb2YgbG9jayB3YWl0cywgYmVjYXVzZSB0aGV5CiAgICAgIG11c3Qg
YmUgaG9sZGluZyB0aGUgZGF0YSBkaWN0aW9uYXJ5IGxhdGNoIGluIGV4Y2x1c2l2ZSBtb2RlLgog
ICAgICBUaGUgdHJhbnNhY3Rpb25zIG11c3Qgbm90IGJlIGFjY2Vzc2luZyBhbnkgb3RoZXIgdGFi
bGVzIG90aGVyIHRoYW4KICAgICAgdGhlIGRhdGEgZGljdGlvbmFyeSB0YWJsZXMuCiAgICAgIAog
ICAgICBUaGUgaGFuZGxpbmcgb2YgUldfWF9MQVRDSCB3YXMgYWNjaWRlbnRhbGx5IGFkZGVkIGlu
IHRoZSBJbm5vREIgUGx1Z2luLAogICAgICBhcyBhIHdyb25nIGZpeCBvZiBhbiBhc3NlcnRpb24g
ZmFpbHVyZS4gKEZhc3QgaW5kZXggY3JlYXRpb24gd2FzIGFjY2Vzc2luZwogICAgICBib3RoIGRh
dGEgZGljdGlvbmFyeSB0YWJsZXMgYW5kIHVzZXIgdGFibGVzIGluIHRoZSBzYW1lIHRyYW5zYWN0
aW9uLikKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2MHNydi5j
Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmMnCi0tLSBh
L3N0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBzcnYuYwlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5j
b20tMjAxMDA4MTkwNDE2NDctd3g5dDlqdHVrZHRiMjNqdgorKysgYi9zdG9yYWdlL2lubm9iYXNl
L3Nydi9zcnYwc3J2LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA4MTkxMDM2
Mzctb2JqazB1NnV2YzZ2ajRtNQpAQCAtMTU4OCw2ICsxNTg4LDE4IEBAIHNydl9zdXNwZW5kX215
c3FsX3RocmVhZCgKIAkJcm93X215c3FsX3VuZnJlZXplX2RhdGFfZGljdGlvbmFyeSh0cngpOwog
CQlicmVhazsKIAljYXNlIFJXX1hfTEFUQ0g6CisJCS8qIFRoZXJlIHNob3VsZCBuZXZlciBiZSBh
IGxvY2sgd2FpdCB3aGVuIHRoZQorCQlkaWN0aW9uYXJ5IGxhdGNoIGlzIHJlc2VydmVkIGluIFgg
bW9kZS4gIERpY3Rpb25hcnkKKwkJdHJhbnNhY3Rpb25zIHNob3VsZCBvbmx5IGFjcXVpcmUgbG9j
a3Mgb24gZGljdGlvbmFyeQorCQl0YWJsZXMsIG5vdCBvdGhlciB0YWJsZXMuIEFsbCBhY2Nlc3Mg
dG8gZGljdGlvbmFyeQorCQl0YWJsZXMgc2hvdWxkIGJlIGNvdmVyZWQgYnkgZGljdGlvbmFyeQor
CQl0cmFuc2FjdGlvbnMuICovCisJCXV0X3ByaW50X3RpbWVzdGFtcChzdGRlcnIpOworCQlmcHV0
cygiICBJbm5vREI6IEVycm9yOiBkaWN0IFggbGF0Y2ggaGVsZCBpbiAiCisJCSAgICAgICJzcnZf
c3VzcGVuZF9teXNxbF90aHJlYWRcbiIsIHN0ZGVycik7CisJCS8qIFRoaXMgc2hvdWxkIG5ldmVy
IG9jY3VyLiBUaGlzIGluY29ycmVjdCBoYW5kbGluZworCQl3YXMgYWRkZWQgaW4gdGhlIGVhcmx5
IGRldmVsb3BtZW50IG9mCisJCWhhX2lubm9iYXNlOjphZGRfaW5kZXgoKSBpbiBJbm5vREIgUGx1
Z2luIDEuMC4gKi8KIAkJLyogUmVsZWFzZSBmYXN0IGluZGV4IGNyZWF0aW9uIGxhdGNoICovCiAJ
CXJvd19teXNxbF91bmxvY2tfZGF0YV9kaWN0aW9uYXJ5KHRyeCk7CiAJCWJyZWFrOwpAQCAtMTYw
Nyw2ICsxNjE5LDkgQEAgc3J2X3N1c3BlbmRfbXlzcWxfdGhyZWFkKAogCQlyb3dfbXlzcWxfZnJl
ZXplX2RhdGFfZGljdGlvbmFyeSh0cngpOwogCQlicmVhazsKIAljYXNlIFJXX1hfTEFUQ0g6CisJ
CS8qIFRoaXMgc2hvdWxkIG5ldmVyIG9jY3VyLiBUaGlzIGluY29ycmVjdCBoYW5kbGluZworCQl3
YXMgYWRkZWQgaW4gdGhlIGVhcmx5IGRldmVsb3BtZW50IG9mCisJCWhhX2lubm9iYXNlOjphZGRf
aW5kZXgoKSBpbiBJbm5vREIgUGx1Z2luIDEuMC4gKi8KIAkJcm93X215c3FsX2xvY2tfZGF0YV9k
aWN0aW9uYXJ5KHRyeCk7CiAJCWJyZWFrOwogCX0KCg==

--===============2135869267==
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: de442226af66242f46d2169d5e77b735702e86ae
# timestamp: 2010-08-19 13:36:45 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: jimmy.yang@stripped\
#   wx9t9jtukdtb23jv
# 
# Begin bundle
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


--===============2135869267==--