From: marko.makela
Date: November 2 2010 7:29am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3648) Bug#57799
List-Archive: http://lists.mysql.com/commits/122489
X-Bug: 57799
Message-Id: <201011020729.oA27RY6S031019@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0350427144=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMjA3MjgwNS1ndm53
ODdwZml1ZmU0YXh1CgogMzY0OCBNYXJrbyBNw6RrZWzDpAkyMDEwLTExLTAyCiAgICAgIEJ1ZyM1
Nzc5OSBSRUFEIFVOQ09NTUlUVEVEIGFjY2VzcyBmYWlsdXJlIG9mIG9mZi1wYWdlIERZTkFNSUMg
b3IgQ09NUFJFU1NFRAogICAgICBjb2x1bW5zIGFnYWluCiAgICAgIAogICAgICBUaGlzIGlzIGZv
bGxvdy11cCB0byBCdWcgIzU0MzU4LiBOb3QgYWxsIG9jY3VycmVuY2VzIG9mIHRoZSBidWcgd2Vy
ZSBmaXhlZC4KICAgICAgV2UgbmVlZCB0byBjaGVjayBhbGwgY2FsbHMgdG8gYnRyX2NvcHlfZXh0
ZXJuYWxseV9zdG9yZWRfZmllbGRfcHJlZml4X2xvdygpCiAgICAgIGFuZCBkbyB0aGUgcmlnaHQg
dGhpbmcgd2hlbiB0aGUgcG9pbnRlciB0byB0aGUgb2ZmLXBhZ2UgY29sdW1uIGlzIG51bGwKICAg
ICAgKGZ1bGwgb2YgemVybyBieXRlcykuCiAgICAgIAogICAgICBJdCB0dXJucyBvdXQgdGhhdCBv
bmx5IHRoZSBjYWxsIHRvIGJ0cl9jb3B5X2V4dGVybmFsbHlfc3RvcmVkX2ZpZWxkX3ByZWZpeCgp
CiAgICAgIGluIHJvd19zZWxfc2VjX3JlY19pc19mb3JfYmxvYigpIG5lZWRzIHRvIGJlIGNoYW5n
ZWQuCiAgICAgIAogICAgICBGb3IgZmV0Y2hpbmcgY29tcGxldGUgb2ZmLXBhZ2UgY29sdW1ucyBy
YXRoZXIgdGhhbiBwcmVmaXhlcywgdGhlIGZ1bmN0aW9uCiAgICAgIGJ0cl9yZWNfY29weV9leHRl
cm5hbGx5X3N0b3JlZF9maWVsZCgpIGFscmVhZHkgY2hlY2tzIGlmIHRoZSBwb2ludGVyCiAgICAg
IGlzIG51bGwgKGFsbC16ZXJvKS4gIFR3byBvZiBpdHMgY2FsbGVycyAocm93X21lcmdlX2NvcHlf
YmxvYnMoKSBhbmQKICAgICAgcm93X3NlbF9mZXRjaF9jb2x1bW5zKCkpIGFyZSBuZXZlciBleGVj
dXRlZCBhcyBSRUFEIENPTU1JVFRFRCBhbmQgY2FuCiAgICAgIHJpZ2h0ZnVsbHkgYXNzZXJ0IHRo
YXQgdGhlIGZldGNoIHN1Y2NlZWRlZC4gIFRoZSB0aGlyZCBjYWxsZXIsCiAgICAgIHJvd19zZWxf
c3RvcmVfbXlzcWxfcmVjKCksIGFscmVhZHkgZG9lcyB0aGUgcmlnaHQgdGhpbmcuCiAgICAgIAog
ICAgICBUaGUgY2FsbHMgaW4gcm93X3VwZF9leHRfZmV0Y2goKSBhbmQgdHJ4X3VuZG9fcGFnZV9m
ZXRjaF9leHQoKSBtdXN0CiAgICAgIGV4cGVjdCB0aGF0IHRoZSBvZmYtcGFnZSBjb2x1bW4gZXhp
c3RzLiBVcGRhdGUgYW5kIHJvbGxiYWNrIGFyZQogICAgICBsb2NraW5nIG9wZXJhdGlvbnMsIG5l
dmVyIFJFQUQgVU5DT01NSVRURUQuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9DaGFuZ2VMb2cKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwc2Vs
LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0t
LSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDExMDIwNzI4MDUtZ3Zudzg3cGZpdWZlNGF4dQorKysgYi9zdG9yYWdlL2lu
bm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAx
MTAyMDcyODQ4LXV1ZmUwYzV4enRiNTFwMG0KQEAgLTEsMyArMSw5IEBACisyMDEwLTExLTAyCVRo
ZSBJbm5vREIgVGVhbQorCisJKiByb3cvcm93MHNlbC5jOgorCUZpeCBCdWcjNTc3OTkgUkVBRCBV
TkNPTU1JVFRFRCBhY2Nlc3MgZmFpbHVyZSBvZiBvZmYtcGFnZQorCURZTkFNSUMgb3IgQ09NUFJF
U1NFRCBjb2x1bW5zIGFnYWluCisKIDIwMTAtMTAtMjQJVGhlIElubm9EQiBUZWFtCiAKIAkqIHJv
dy9yb3cwbXlzcWwuYwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9y
b3cvcm93MHNlbC5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBzZWwuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEwMjA3MjgwNS1ndm53ODdwZml1ZmU0
YXh1CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHNlbC5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTAyMDcyODQ4LXV1ZmUwYzV4enRiNTFwMG0KQEAgLTEw
Niw2ICsxMDYsMTggQEAgcm93X3NlbF9zZWNfcmVjX2lzX2Zvcl9ibG9iKAogCXVsaW50CWxlbjsK
IAlieXRlCWJ1ZltESUNUX01BWF9JTkRFWF9DT0xfTEVOXTsKIAorCXV0X2EoY2x1c3RfbGVuID49
IEJUUl9FWFRFUk5fRklFTERfUkVGX1NJWkUpOworCisJaWYgKFVOSVZfVU5MSUtFTFkKKwkgICAg
KCFtZW1jbXAoY2x1c3RfZmllbGQgKyBjbHVzdF9sZW4gLSBCVFJfRVhURVJOX0ZJRUxEX1JFRl9T
SVpFLAorCQkgICAgIGZpZWxkX3JlZl96ZXJvLCBCVFJfRVhURVJOX0ZJRUxEX1JFRl9TSVpFKSkp
IHsKKwkJLyogVGhlIGV4dGVybmFsbHkgc3RvcmVkIGZpZWxkIHdhcyBub3Qgd3JpdHRlbiB5ZXQu
CisJCVRoaXMgcmVjb3JkIHNob3VsZCBvbmx5IGJlIHNlZW4gYnkKKwkJcmVjdl9yZWNvdmVyeV9y
b2xsYmFja19hY3RpdmUoKSBvciBhbnkKKwkJVFJYX0lTT19SRUFEX1VOQ09NTUlUVEVEIHRyYW5z
YWN0aW9ucy4gKi8KKwkJcmV0dXJuKEZBTFNFKTsKKwl9CisKIAlsZW4gPSBidHJfY29weV9leHRl
cm5hbGx5X3N0b3JlZF9maWVsZF9wcmVmaXgoYnVmLCBzaXplb2YgYnVmLAogCQkJCQkJICAgICAg
emlwX3NpemUsCiAJCQkJCQkgICAgICBjbHVzdF9maWVsZCwgY2x1c3RfbGVuKTsKCg==

--===============0350427144==
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: 39440610118e4bec782d6edb80d5ccac20e8c71e
# timestamp: 2010-11-02 09:29:08 +0200
# base_revision_id: marko.makela@stripped\
#   gvnw87pfiufe4axu
# 
# Begin bundle
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


--===============0350427144==--