From: marko.makela
Date: January 10 2011 1:35pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3683) Bug#59181
List-Archive: http://lists.mysql.com/commits/128297
X-Bug: 59181
Message-Id: <201101101335.p0ADEEaS001964@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0868765281=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMTA4MTQ1MTE5LTR6a2c3
Y2JhZnpxdXg1Z3kKCiAzNjgzIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDEtMTAKICAgICAgQnVnIzU5
MTgxIElubm9EQiBjb21waWxhdGlvbiBmYWlsdXJlIG9uIHRoZSBTdW4gU3R1ZGlvIGNvbXBpbGVy
CiAgICAgIAogICAgICBEZWZpbmUgVU5JVl9QUkVGRVRDSF9SKGFkZCkgYXMgc3VuX3ByZWZldGNo
X3JlYWRfbWFueSgodm9pZCopIGFkZHIpLAogICAgICBiZWNhdXNlIGFwcGFyZW50bHkgc29tZSB2
ZXJzaW9ucyBvZiB0aGUgU3VuIGxpYnJhcnkKICAgICAgb21pdCB0aGUgY29uc3QgcXVhbGlmaWVy
LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS91bml2
LmkKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3VuaXYu
aScKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvdW5pdi5pCXJldmlkOnZhc2ls
LmRpbW92QG9yYWNsZS5jb20tMjAxMTAxMDgxNDUxMTktNHprZzdjYmFmenF1eDVneQorKysgYi9z
dG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS91bml2LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTAxMTAxMzM0NDUtd3E4dmp2bTlhZzhxc29nOQpAQCAtNDEyLDcgKzQxMiw3
IEBAIGl0IGlzIHJlYWQgb3Igd3JpdHRlbi4gKi8KIC8qIFVzZSBzdW5fcHJlZmV0Y2ggd2hlbiBj
b21waWxlIHdpdGggU3VuIFN0dWRpbyAqLwogIyBkZWZpbmUgVU5JVl9FWFBFQ1QoZXhwcix2YWx1
ZSkgKGV4cHIpCiAjIGRlZmluZSBVTklWX0xJS0VMWV9OVUxMKGV4cHIpIChleHByKQotIyBkZWZp
bmUgVU5JVl9QUkVGRVRDSF9SKGFkZHIpIHN1bl9wcmVmZXRjaF9yZWFkX21hbnkoYWRkcikKKyMg
ZGVmaW5lIFVOSVZfUFJFRkVUQ0hfUihhZGRyKSBzdW5fcHJlZmV0Y2hfcmVhZF9tYW55KCh2b2lk
KikgYWRkcikKICMgZGVmaW5lIFVOSVZfUFJFRkVUQ0hfUlcoYWRkcikgc3VuX3ByZWZldGNoX3dy
aXRlX21hbnkoYWRkcikKICNlbHNlCiAvKiBEdW1teSB2ZXJzaW9ucyBvZiB0aGUgbWFjcm9zICov
Cgo=

--===============0868765281==
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: a07eef7bdc9f1b1227d17f4b86ec8286cc0eb717
# timestamp: 2011-01-10 15:35:15 +0200
# base_revision_id: vasil.dimov@stripped\
#   4zkg7cbafzqux5gy
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeGhx+sAAZJflAAQWnf/919j
XwC////wBAAIAFADzXlWy2lFW20hJIQCm0aYmJPUynqegmgNqZpNNlPUZAOYBMBMjACMTEwmEwQ0
xNMBKJomSZT0xE9EyAA0Gg0GmgAA5gEwEyMAIxMTCYTBDTE0wEkpo01PCmTUYMoEeU9TTRo0A0DJ
kaOOTTM3nfvbCOtOkvnqYC26V8UHfvCerdKzMcMq/MI53Er2Zv19svALBV4Xtjg7zr0vs+JsjWKR
pmYjqmlw4R2DLqzIOZYeedSGY8DZtLNnSXPGLrFyEVKpKVaNGPHNrAu4kjuC/xXOlTTSMMxGwU2b
e7c4GEMLemS6q5QwXEM8IHCpkysbqUxPju4PEdbCgHRrOXfWAaAoyxRxKZs2ax4nclSTh+pojs3L
PdfbfH0XBe3cyzMr3FDYQxEec1Tji9Sdea7qww7G7EQmW3SqGgK+YralHi5UqBNIGSqtPJ9LCoE8
HTaNLiBYTBAtVeLgjEvCTQndJ4MVZAmtIYUzqSkLQYE/AV9s7mTbK3RuxWeCiXlitYy0rZhQeoaw
lJR9YYS0VuWpXO40UYwdgVSdOTjPQXiJgeEFU+luQVGmszECBEoJZhFIZaWIVBBVnw2LCrAxFyLF
YEgjJakeGct7aayjrc/VsrpXuDFLfIZGGPHVyPhCLuPIkKEeRxLZN3ngHeOUBjuPA7zK7FgxKj6H
4awYPMuZdPA3dKX98e9IpOFbM76BzCyxh4daX877LI4ijspF6wSii7Qes9v13OVQ75lZ1xBAgsFH
29EfVbAHrdKTJ5Qu45ufSoA6a5jLLIuyZkhy7UjDaqRtOLl0OuuknprDS9UPlvTgqVM771NrM4SZ
lRRtKSp2OvVKnguG9jT0x46WxdLKE5RXq6rN+VopDvqr6KWZ/o44gSLsTKrCTRZfJzx3l5OEifpn
Wg6ddsPZcqCsyL12xwL3HUbQ9uAOFUJkbg6A2hqUOiiYcU2cjXTN/Ym44aiFA5LE2h48LPBWBIVU
fG6yE0+RGsNZWn1QFdBNUl6bAtC4DENoSCVSQ4zJDLXEv5LXp98MRF4mySznafYa7Faka30jXK4H
vGGrcqoKWwegPXYgJobGQLBHsmUhz4vZKMyUXisNCQ69yliYMGfIckjAOZa6lfpRHS1lScVsO0ce
0f5C6xZrw1Q51UE0lvJSJkRKcNBPNACdL7SgPekHJic10KKEyXohiC5p0r9BXSo0gcNGknub9Fdp
VGB5mVt+eQ6MQYHKupS/tM8lP5YvJHA3TToZ5BNXBcFyvwDEXkL0msWwLEvlU440BfqO8I64fxPp
/xdyRThQkOGhx+s=


--===============0868765281==--