From: marko.makela
Date: May 4 2010 10:55am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3438)
List-Archive: http://lists.mysql.com/commits/107295
Message-Id: <201005041056.o44AoaeQ015965@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0036632591=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDQwOTMxMjgtNDR2Nmds
dXBlMWRzaDB1ZwoKIDM0MzggTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBSZW1vdmUg
VU5JVl9CVFJfQVZPSURfQ09QWS4gSXQgd2FzIGJyb2tlbiBiZWNhdXNlIGJ0cl9hdHRhY2hfaGFs
Zl9wYWdlcygpCiAgICAgIHdvdWxkIGdldCB0aGUgYmxvY2ssIG5ld19ibG9jayBpbiB0aGUgd3Jv
bmcgb3JkZXIuCiAgICAgIEZpeGluZyB0aGF0IHdvdWxkIGhhdmUgY29tcGxpY2F0ZWQgdGhlIGZ1
bmN0aW9uIGV2ZW4gZnVydGhlcgogICAgICBmb3IgdGhpcyBtYXJnaW5hbCBjYXNlLgoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCiAgICAgIHN0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGJ0ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9pbmNsdWRlL3VuaXYuaQo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L0NoYW5nZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwkyMDEwLTA1
LTAzIDEyOjI4OjU5ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJ
MjAxMC0wNS0wNCAxMDo1NTo0NiArMDAwMApAQCAtNDgsMTIgKzQ4LDYgQEAKIAlPbmx5IGNoZWNr
IHRoZSByZWNvcmQgc2l6ZSBhdCBpbmRleCBjcmVhdGlvbiB0aW1lIHdoZW4KIAlpbm5vZGJfc3Ry
aWN0X21vZGUgaXMgc2V0IG9yIHdoZW4gUk9XX0ZPUk1BVCBpcyBEWU5BTUlDIG9yIENPTVBSRVNT
RUQuCiAKLTIwMTAtMDQtMjAJVGhlIElubm9EQiBUZWFtCi0KLQkqIGJ0ci9idHIwYnRyLmMsIGlu
Y2x1ZGUvdW5pdi5pOgotCUltcGxlbWVudCBVTklWX0JUUl9BVk9JRF9DT1BZLCBmb3IgYXZvaWRp
bmcgd3JpdGVzIHdoZW4gYSBCLXRyZWUKLQlub2RlIGlzIHNwbGl0IGF0IHRoZSBmaXJzdCBvciBs
YXN0IHJlY29yZC4KLQogMjAxMC0wNC0xNQlUaGUgSW5ub0RCIFRlYW0KIAogCSogdHJ4L3RyeDBy
ZWMuYzoKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBi
dHIuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRyLmMJMjAxMC0wNS0w
NCAwOTozMToyOCArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBidHIu
YwkyMDEwLTA1LTA0IDEwOjU1OjQ2ICswMDAwCkBAIC0yMDQ2LDE3ICsyMDQ2LDcgQEAgaW5zZXJ0
X2VtcHR5OgogCX0KIAogCS8qIDUuIE1vdmUgdGhlbiB0aGUgcmVjb3JkcyB0byB0aGUgbmV3IHBh
Z2UgKi8KLQlpZiAoZGlyZWN0aW9uID09IEZTUF9ET1dOCi0jaWZkZWYgVU5JVl9CVFJfQVZPSURf
Q09QWQotCSAgICAmJiBwYWdlX3JlY19pc19zdXByZW11bShtb3ZlX2xpbWl0KSkgewotCQkvKiBJ
bnN0ZWFkIG9mIG1vdmluZyBhbGwgcmVjb3JkcywgbWFrZSB0aGUgbmV3IHBhZ2UKLQkJdGhlIGVt
cHR5IHBhZ2UuICovCi0KLQkJbGVmdF9ibG9jayA9IGJsb2NrOwotCQlyaWdodF9ibG9jayA9IG5l
d19ibG9jazsKLQl9IGVsc2UgaWYgKGRpcmVjdGlvbiA9PSBGU1BfRE9XTgotI2VuZGlmIC8qIFVO
SVZfQlRSX0FWT0lEX0NPUFkgKi8KLQkJICAgKSB7CisJaWYgKGRpcmVjdGlvbiA9PSBGU1BfRE9X
TikgewogCQkvKgkJZnB1dHMoIlNwbGl0IGxlZnRcbiIsIHN0ZGVycik7ICovCiAKIAkJaWYgKDAK
QEAgLTIwOTksMTQgKzIwODksNiBAQCBpbnNlcnRfZW1wdHk6CiAJCXJpZ2h0X2Jsb2NrID0gYmxv
Y2s7CiAKIAkJbG9ja191cGRhdGVfc3BsaXRfbGVmdChyaWdodF9ibG9jaywgbGVmdF9ibG9jayk7
Ci0jaWZkZWYgVU5JVl9CVFJfQVZPSURfQ09QWQotCX0gZWxzZSBpZiAoIXNwbGl0X3JlYykgewot
CQkvKiBJbnN0ZWFkIG9mIG1vdmluZyBhbGwgcmVjb3JkcywgbWFrZSB0aGUgbmV3IHBhZ2UKLQkJ
dGhlIGVtcHR5IHBhZ2UuICovCi0KLQkJbGVmdF9ibG9jayA9IG5ld19ibG9jazsKLQkJcmlnaHRf
YmxvY2sgPSBibG9jazsKLSNlbmRpZiAvKiBVTklWX0JUUl9BVk9JRF9DT1BZICovCiAJfSBlbHNl
IHsKIAkJLyoJCWZwdXRzKCJTcGxpdCByaWdodFxuIiwgc3RkZXJyKTsgKi8KIAoKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3VuaXYuaScKLS0tIGEvc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvdW5pdi5pCTIwMTAtMDQtMjYgMDg6MzU6NTcgKzAw
MDAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvdW5pdi5pCTIwMTAtMDUtMDQg
MTA6NTU6NDYgKzAwMDAKQEAgLTIwNSwxMCArMjA1LDYgQEAgb3BlcmF0aW9ucyAodmVyeSBzbG93
KTsgYWxzbyBVTklWX0RFQlVHCiAJCQkJCQlhZGFwdGl2ZSBoYXNoIGluZGV4ICovCiAjZGVmaW5l
IFVOSVZfU1JWX1BSSU5UX0xBVENIX1dBSVRTCQkvKiBlbmFibGUgZGlhZ25vc3RpYyBvdXRwdXQK
IAkJCQkJCWluIHN5bmMwc3luYy5jICovCi0jZGVmaW5lIFVOSVZfQlRSX0FWT0lEX0NPUFkJCQkv
KiB3aGVuIHNwbGl0dGluZyBCLXRyZWUgbm9kZXMsCi0JCQkJCQlkbyBub3QgbW92ZSBhbnkgcmVj
b3JkcyB3aGVuCi0JCQkJCQlhbGwgdGhlIHJlY29yZHMgd291bGQKLQkJCQkJCWJlIG1vdmVkICov
CiAjZGVmaW5lIFVOSVZfQlRSX1BSSU5UCQkJCS8qIGVuYWJsZSBmdW5jdGlvbnMgZm9yCiAJCQkJ
CQlwcmludGluZyBCLXRyZWVzICovCiAjZGVmaW5lIFVOSVZfWklQX0RFQlVHCQkJCS8qIGV4dGVu
c2l2ZSBjb25zaXN0ZW5jeSBjaGVja3MKCg==

--===============0036632591==
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/mysql/5.1-innodb/
# testament_sha1: a580f765deedf63094e011159814c68af3a7780c
# timestamp: 2010-05-04 13:55:55 +0300
# base_revision_id: marko.makela@stripped\
#   44v6glupe1dsh0ug
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS0eLfEAAvnfgEAwW2f//38n
36C/7//4UAW7p7oABdYG2ta1bu0JJNQhk1TyejTKempN5T0JHonqAAZAaZPU0OMmTJiMTACZMEyA
GjCMAQwDIiZU80pkNPaKeKNAZAGIAZBk0AEiiJMAT9U0aZGajR6jQAAAADIBVJMQmTJoTCmTJR+J
MZTUyP1PU9CjCaPUGi4y7RejG3+Q+2XzUeD5DMAhgkIJRO2pxFbrrCBYG6J1jjnxxsWdjxu4Akra
bbY2HtqI+pqg7ruMjCBGWnNNcRzVciJLxUU+jU0pnYqIf3ReDG5y1r0cgw39xgNSABkZZnSBohXs
0pLXG1lliIs82o99BQVKtRJVkWAnANKcYJRg5vV+P191JOzw+WrrG3p/9gF59R3Id4viAqr5o+96
e7yWTVRpkBVxVqQVBhukXuRLNIkzCaTslul46IO5ScCwW3Jy4rliIlNtWREVvQvFaJOGpVdbZWpN
In/tvjF3+Q38jSI56rNc7fHScoGSHwW+Et/yx+N4lVdYcdVbHPq4GBhg0Y+g0rxtssvLBoxM2x78
fT27dty7gg2xFZMCWvzdbXr7npPkyXuU57lyuNthwjnBYjVhJKXoiKl7JuLtbGWGXSbl3sTVhNbT
BzE1F64XQ1trJ0K423q0vRmSQsvZ0wVsjpm4mkQ0VtZlJKirdw99EP+bzttS4b6+e1nAxtu90s2x
C2kkMOKZq123pLhtS5UUN7k12sRRrcXDvo54cIhRTqxVyb2xpcpFmglflDFMWv37DVq27k8trbTc
MPlwhg/hasmkK7yNae2HQ0Qohm1uj26W49C65LooWDZP1izYxWcbs2lNNVWbRpYqya3JfPVpmJzw
rYamIymznc0ZLULYvlRx0uJGMK5GCLbkTs65S7PRtkOyTy2NjZzkQ2Qc2vAi6kyg2u7aHV63kgYn
g9ZSK3Bklxnk2MbHDzfoV4es9YuMCDD36pq6dXPmz/HzWzZ6NHLZ76Mf94z5Xu9X004Mzc6aDC4P
dHfIKMcDYBacDgC9DF5h+mHhpAr4PtaKIr+gbtPysMLYoeFyF395Bx/D4zukn9sp9tiHNXydLf4/
Sgo83m93qevZPfhgn741RJSfn/OISYNo8mTUydVXaKyewY9mG4fRwHeufvr9mr5zT+dJWQJxPfAy
ZU3/Ym4dTgq0WLoVhLY0a0Ks9g6G2N7u35irqOj9vYY9vb9lnOJuMUmQ/zgXtzmotsucE+tc2t3w
Q9XwVIWS/iZvOKkDFiL1kwEbVytkjsnigOR4Zk00mmqKMmqwIzPeNSmjwmEaxFcqWLHXOBZcaxjW
QWO+rPi6XW68WCjpHrTMlzM/aPbHE6eE5x75G7CM3QGWA6ZJo7ag7ryzZYDDAb/knulZZ2cuEQ2h
F0RvXkMmu0OWrbETmfIGCWIROTSKeFZRZ/Hy9d0WOXKzIJzLqtEV6VmxLVyqITZjwuAL6xWIT93V
7dcJh2KRjAlEW+MqXO7ZdHWeFmcD+IFnJ0cGX4IIZaFkzA/PQXiLJ3pxTBFv0yPIw0IIHcDiqqK1
GKeeEHMGGdBHWprCi0moUFLQwBl6euS0x1eKa1IJgW1xZfBAdItDrodafaWEpshVpaooxolUDAFg
IWo6GgOv1culfxWJKLE04JIoT6d++5DLx6I2SidMbbIGqMceFdxuvXSXIsi/KhQibAdI+/F/VzgM
AnAfAEKYEYKZS8l6+Srtcu80WnCKbRCJ6xSMFzaoEC8xiyLlENmExIyJdDmmZdJ5IZO18XK9FxnX
HGKeHgYbJW8tI3X30Q5SQ+sqcGJ94iJKiitmazbrhzUShB6yWqf/i7kinChIFo8W+IA=


--===============0036632591==--