From: marko.makela
Date: January 10 2011 1:42pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3682 to 3683) Bug#59181
List-Archive: http://lists.mysql.com/commits/128303
X-Bug: 59181
Message-Id: <201101101342.p0ACs7kB032131@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0694812860=="

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

IDM2ODMgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0xMAogICAgICBCdWcjNTkxODEgSW5ub0RCIGNv
bXBpbGF0aW9uIGZhaWx1cmUgb24gdGhlIFN1biBTdHVkaW8gY29tcGlsZXIKICAgICAgCiAgICAg
IERlZmluZSBVTklWX1BSRUZFVENIX1IoYWRkKSBhcyBzdW5fcHJlZmV0Y2hfcmVhZF9tYW55KCh2
b2lkKikgYWRkciksCiAgICAgIGJlY2F1c2UgYXBwYXJlbnRseSBzb21lIHZlcnNpb25zIG9mIHRo
ZSBTdW4gbGlicmFyeQogICAgICBvbWl0IHRoZSBjb25zdCBxdWFsaWZpZXIuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3VuaXYuaQogMzY4MiBWYXNp
bCBEaW1vdgkyMDExLTAxLTA4CiAgICAgIEluY3JlbWVudCBJbm5vREIgUGx1Z2luIHZlcnNpb24g
ZnJvbSAxLjAuMTQgdG8gMS4wLjE1LgogICAgICBJbm5vREIgUGx1Z2luIDEuMC4xNCBoYXMgYmVl
biByZWxlYXNlZCB3aXRoIE15U1FMIDUuMS41NC4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvdW5pdi5pCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9kYl9wbHVnaW4vaW5jbHVkZS91bml2LmknCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9pbmNsdWRlL3VuaXYuaQlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwMTA4MTQ1
MTE5LTR6a2c3Y2JhZnpxdXg1Z3kKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUv
dW5pdi5pCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTEwMTMzNDQ1LXdxOHZq
dm05YWc4cXNvZzkKQEAgLTQxMiw3ICs0MTIsNyBAQCBpdCBpcyByZWFkIG9yIHdyaXR0ZW4uICov
CiAvKiBVc2Ugc3VuX3ByZWZldGNoIHdoZW4gY29tcGlsZSB3aXRoIFN1biBTdHVkaW8gKi8KICMg
ZGVmaW5lIFVOSVZfRVhQRUNUKGV4cHIsdmFsdWUpIChleHByKQogIyBkZWZpbmUgVU5JVl9MSUtF
TFlfTlVMTChleHByKSAoZXhwcikKLSMgZGVmaW5lIFVOSVZfUFJFRkVUQ0hfUihhZGRyKSBzdW5f
cHJlZmV0Y2hfcmVhZF9tYW55KGFkZHIpCisjIGRlZmluZSBVTklWX1BSRUZFVENIX1IoYWRkcikg
c3VuX3ByZWZldGNoX3JlYWRfbWFueSgodm9pZCopIGFkZHIpCiAjIGRlZmluZSBVTklWX1BSRUZF
VENIX1JXKGFkZHIpIHN1bl9wcmVmZXRjaF93cml0ZV9tYW55KGFkZHIpCiAjZWxzZQogLyogRHVt
bXkgdmVyc2lvbnMgb2YgdGhlIG1hY3JvcyAqLwoK

--===============0694812860==
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:42:18 +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=


--===============0694812860==--